Author: jtn
Date: Fri Apr 11 00:59:16 2014
New Revision: 24754
URL: http://svn.gna.org/viewcvs/freeciv?rev=24754&view=rev
Log:
Fix crash in is_my_zoc() associated with unknown terrain.
Report and patch by pepeto (pepeto@gna).
See gna bug #21894.
Modified:
trunk/common/unit.c
Modified: trunk/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=24754&r1=24753&r2=24754&view=diff
==============================================================================
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Fri Apr 11 00:59:16 2014
@@ -1706,8 +1706,12 @@
**************************************************************************/
bool is_my_zoc(const struct player *pplayer, const struct tile *ptile0)
{
+ struct terrain *pterrain;
+
square_iterate(ptile0, 1, ptile) {
- if (terrain_has_flag(tile_terrain(ptile), TER_NO_ZOC)) {
+ pterrain = tile_terrain(ptile);
+ if (T_UNKNOWN == pterrain
+ || terrain_has_flag(pterrain, TER_NO_ZOC)) {
continue;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
