widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/bug1201330 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1201330 in widelands: "Dangerous variable-length array (VLA) declaration in map_generator.cc"
  https://bugs.launchpad.net/widelands/+bug/1201330

For more details, see:
https://code.launchpad.net/~hjd/widelands/bug1201330/+merge/174737
-- 
https://code.launchpad.net/~hjd/widelands/bug1201330/+merge/174737
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/bug1201330 into lp:widelands.

=== modified file 'src/map_generator.cc'
--- src/map_generator.cc	2013-07-14 16:35:20 +0000
+++ src/map_generator.cc	2013-07-15 12:02:33 +0000
@@ -775,6 +775,7 @@
 	}
 
 	// Random placement of starting positions
+	assert(m_mapInfo.numPlayers);
 	Player_Number pn[m_mapInfo.numPlayers];
 	for (Player_Number n = 1; n <= m_mapInfo.numPlayers; ++n) {
 		bool okay = false;