Fix postgis bug with empty geometrycollections

MapServer · Dec 9, 2014 · 8b8a5de · 8b8a5de
1 parent a08ec40
commit 8b8a5de
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mappostgis.c b/mappostgis.c
@@ -587,7 +587,7 @@ wkbConvCollectionToShape(wkbObj *w, shapeObj *shape)
       failures++;
     }
   }
-  if ( failures == ncomponents )
+  if ( failures == ncomponents || ncomponents == 0 )
     return MS_FAILURE;
   else
     return MS_SUCCESS;
@@ -2207,6 +2207,9 @@ int msPostGISReadShape(layerObj *layer, shapeObj *shape)
 
     msComputeBounds(shape);
   }
+  else {
+    shape->type = MS_SHAPE_NULL;
+  }
 
   if( layer->debug > 2 ) {
     char *tmp = msShapeToWKT(shape);