[Commits] [wesnoth/wesnoth] 9683de: backport SConstruct patch 8f93e0ebb01a2cccafa45f85...

[GitHub]

  Branch: refs/heads/1.10
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 9683de3d841c29a921155c41f7905032bf3a8f18
      https://github.com/wesnoth/wesnoth/commit/9683de3d841c29a921155c41f7905032bf3a8f18
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  backport SConstruct patch 8f93e0ebb01a2cccafa45f851dd18dc660f94176

This is to assist package managers trying to build the project, by
giving them a diff they can refer to.


  Commit: 669b9bb05e40fff0c25efc68ff96580fea504e99
      https://github.com/wesnoth/wesnoth/commit/669b9bb05e40fff0c25efc68ff96580fea504e99
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M SConstruct

  Log Message:
  -----------
  Merge branch '1.10.7_scons_patches' into 1.10


  Commit: 3f84dc8a951a9320587b613fe6680ca17e66e957
      https://github.com/wesnoth/wesnoth/commit/3f84dc8a951a9320587b613fe6680ca17e66e957
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M src/server/player.cpp

  Log Message:
  -----------
  fix an uncaught bad lexical cast exception

coverity reports that it is uncaught and would therefore crash
the server if it occurred


  Commit: f04f7ea1ecdbf49e5e5ef24896d50f395158e468
      https://github.com/wesnoth/wesnoth/commit/f04f7ea1ecdbf49e5e5ef24896d50f395158e468
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M src/server/game.cpp
    M src/server/room_manager.cpp
    M src/server/server.cpp

  Log Message:
  -----------
  replace many lexical_cast with lexical_cast_default

This is to avoid bad_lexical_cast exception. I'm not sure if in
any cases this could actually have thrown but it's better to be
safe.

Conflicts:
	src/server/game.cpp


  Commit: 8a687c1a0ba2a3083015f33c968fcf7b0f72f55f
      https://github.com/wesnoth/wesnoth/commit/8a687c1a0ba2a3083015f33c968fcf7b0f72f55f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  catch boost::bad_function_call exceptions in server command handler

Don't know if this can actually happen in practice but it is
reported by coverity.


  Commit: 44cf1d4a2d4c90a914dede507522f7ec54a09f5d
      https://github.com/wesnoth/wesnoth/commit/44cf1d4a2d4c90a914dede507522f7ec54a09f5d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M src/server/ban.cpp
    M src/server/server.cpp

  Log Message:
  -----------
  server: catch invalid utf8 exceptions

issue reported by coverity

Conflicts:
	src/server/ban.cpp
	src/server/server.cpp


Compare: https://github.com/wesnoth/wesnoth/compare/fad11f77e86d...44cf1d4a2d4c