Greetings,

Yesterday I added a fix for PR#39328 to its ticket. I later found a related crash, which I have also fixed with the patch attached to this message. This patch incorporates the one attached to the ticket.

  Description of problem and fix are at:
http://bugs.freeciv.org/Ticket/Display.html?id=39328

Eric
Index: server/plrhand.c
===================================================================
--- server/plrhand.c    (revision 12911)
+++ server/plrhand.c    (working copy)
@@ -768,14 +768,14 @@
 {
   va_list args;
 
-  va_start(args, format);
   players_iterate(other_player) {
+    va_start(args, format);
     if (!players_on_same_team(pplayer, other_player)) {
       continue;
     }
     vnotify_conn(other_player->connections, ptile, event, format, args);
+    va_end(args);
   } players_iterate_end;
-  va_end(args);
 }
 
 /****************************************************************************
@@ -792,13 +792,13 @@
   struct player_research *research = get_player_research(pplayer);
 
   /* This function is structured just like notify_team. */
-  va_start(args, format);
   players_iterate(other_player) {
+    va_start(args, format);
     if (get_player_research(other_player) == research) {
       vnotify_conn(other_player->connections, NULL, event, format, args);
     }
+    va_end(args);
   } players_iterate_end;
-  va_end(args);
 }
 
 /**************************************************************************
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to