[mapserver-commits] r10354 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-07-14 15:56:52 +0000 (Wed, 14 Jul 2010)
New Revision: 10354

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogr.cpp
Log:
Fixed segmentation fault in ogr driver when shape type is null

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-07-14 09:55:52 UTC (rev 10353)
+++ trunk/mapserver/HISTORY.TXT	2010-07-14 15:56:52 UTC (rev 10354)
@@ -20,6 +20,8 @@
   them and who understand the potential security risk (not recommended for 
   production servers or those who don't understand the security implications).
 
+- Fixed segmentation fault in ogr driver when shape type is null 
+
 - Fixed synchronized MS_UNITS and inchesPerUnits array (#3173) 
 
 - Fixed possible buffer overflow in msTmpFile() (#3484)

Modified: trunk/mapserver/mapogr.cpp
===================================================================
--- trunk/mapserver/mapogr.cpp	2010-07-14 09:55:52 UTC (rev 10353)
+++ trunk/mapserver/mapogr.cpp	2010-07-14 15:56:52 UTC (rev 10354)
@@ -1791,7 +1791,7 @@
               if (layer->debug >= MS_DEBUGLEVEL_VVV)
                   msDebug("msOGRFileNextShape: Rejecting feature (shapeid = %d, tileid=%d) of incompatible type for this layer (feature wkbType %d, layer type %d)\n",
                           OGR_F_GetFID( hFeature ), psInfo->nTileId, 
-                          wkbFlatten( OGR_G_GetGeometryType( OGR_F_GetGeometryRef( hFeature ) ) ), 
+                          OGR_F_GetGeometryRef( hFeature )==NULL ? wkbFlatten(wkbUnknown):wkbFlatten( OGR_G_GetGeometryType( OGR_F_GetGeometryRef( hFeature ) ) ), 
                           layer->type);
 
           }