Fix shapefile driver crash in msSHPLayerNextShape (#6524)

MapServer · May 5, 2022 · 6ceabc2 · 6ceabc2
1 parent edb261e
commit 6ceabc2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/mapshape.c b/mapshape.c
@@ -2787,6 +2787,11 @@ int msSHPLayerNextShape(layerObj *layer, shapeObj *shape)
     return MS_FAILURE;
   }
 
+  if (!shpfile->status) {
+    /* probably whichShapes didn't overlap */
+    return MS_DONE;
+  }
+
   i = msGetNextBit(shpfile->status, shpfile->lastshape + 1, shpfile->numshapes);
   shpfile->lastshape = i;
   if(i == -1) return(MS_DONE); /* nothing else to read */