Author: cazfi
Date: Thu May 18 15:24:00 2017
New Revision: 35650
URL: http://svn.gna.org/viewcvs/freeciv?rev=35650&view=rev
Log:
Fix NULL dereference when there's no suitable founder unit type
See hrm Bug #661409
Modified:
branches/S2_6/ai/default/daidomestic.c
Modified: branches/S2_6/ai/default/daidomestic.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/daidomestic.c?rev=35650&r1=35649&r2=35650&view=diff
==============================================================================
--- branches/S2_6/ai/default/daidomestic.c (original)
+++ branches/S2_6/ai/default/daidomestic.c Thu May 18 15:24:00 2017
@@ -460,7 +460,7 @@
settler_want = city_data->settler_want * pplayer->ai_common.expand / 100;
if (adv->wonder_city == pcity->id) {
- if (!settler_type || settler_type->pop_cost > 0) {
+ if (settler_type == NULL || settler_type->pop_cost > 0) {
settler_want /= 5;
} else {
settler_want /= 2;
@@ -492,13 +492,13 @@
founder_want = city_data->founder_want;
if (adv->wonder_city == pcity->id) {
- if (founder_type->pop_cost > 0) {
+ if (founder_type == NULL || founder_type->pop_cost > 0) {
founder_want /= 5;
} else {
founder_want /= 2;
}
}
-
+
if (adv->max_num_cities <= city_list_size(pplayer->cities)) {
founder_want /= 100;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
