[Freeciv-Dev] Re: (PR#1870) FreecivAC: borders patch

["Ben Webb" <ben@xxxxxxxxxxxxxxxxxxxxxx>]

On Thu, Jun 26, 2003 at 04:27:58PM -0700, Jason Short wrote:
> [ben@xxxxxxxxxxxxxxxxxxxxxx - Thu Jun 26 20:08:45 2003]:
> > I've fixed a few bugs with the borders patch, and split it into two.
> 
> Nice.
> 
> If I connect to an old server with the new client, I get a client segfault:

I can reproduce this - hopefully it's the same bug you're seeing. Fix
attached, which I'll put into the next version of the patch.

        Ben
-- 
ben@xxxxxxxxxxxxxxxxxxxxxx         http://bellatrix.pcl.ox.ac.uk/~ben/
"The vocabulary of Bradshaw is nervous and terse, but limited."
        - 'The Valley of Fear', Sir Arthur Conan Doyle

Index: client/mapview_common.c
===================================================================
RCS file: /cvsroot/freecivac/freecivac/client/mapview_common.c,v
retrieving revision 1.9
diff -u -r1.9 mapview_common.c
--- client/mapview_common.c     26 Jun 2003 19:58:48 -0000      1.9
+++ client/mapview_common.c     27 Jun 2003 10:54:53 -0000
@@ -564,6 +564,10 @@
   struct player *this_owner = map_get_owner(map_x, map_y), *adjc_owner;
   int x1, y1;
 
+  if (game.borders == 0) {
+    return;
+  }
+
   /* left side */
   if ((draw & D_M_L) && MAPSTEP(x1, y1, map_x, map_y, DIR8_WEST)
       && this_owner != (adjc_owner = map_get_owner(x1, y1))