[mapserver-commits] r9327 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-09-21 15:30:42 -0400 (Mon, 21 Sep 2009)
New Revision: 9327

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgeos.c
Log:
Fixed MapScript shapeObj->toWkt() segfaults (#2763)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-09-21 16:15:24 UTC (rev 9326)
+++ trunk/mapserver/HISTORY.TXT	2009-09-21 19:30:42 UTC (rev 9327)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed MapScript shapeObj->toWkt() segfaults (#2763)
+
 - add vertical bar charts to dynamic charting (#3128)
 
 - Get the intersection points and labels #3101

Modified: trunk/mapserver/mapgeos.c
===================================================================
--- trunk/mapserver/mapgeos.c	2009-09-21 16:15:24 UTC (rev 9326)
+++ trunk/mapserver/mapgeos.c	2009-09-21 19:30:42 UTC (rev 9327)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  MapServer-GEOS integration.
@@ -628,7 +628,7 @@
     return NULL;
     
   /* if we have a geometry, we should update it*/
-  msGEOSFreeGeometry(shape->geometry);
+  msGEOSFreeGeometry(shape);
 
   shape->geometry = (GEOSGeom) msGEOSShape2Geometry(shape);
   g = (GEOSGeom) shape->geometry;