Merge pull request #6522 from szekerest/6521_fix

Handle null shapes in msShapefileWhichShapes (#6521)
MapServer · May 2, 2022 · e285ae1 · e285ae1
2 parents 8af8251 + 0fa98bf
commit e285ae1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mapshape.c b/mapshape.c
@@ -1891,8 +1891,12 @@ int msShapefileWhichShapes(shapefileObj *shpfile, rectObj rect, int debug)
       }
 
       for(i=0; i<shpfile->numshapes; i++) {
-        if(msSHPReadBounds(shpfile->hSHP, i, &shaperect) != MS_SUCCESS)
+        if(msSHPReadBounds(shpfile->hSHP, i, &shaperect) != MS_SUCCESS) {
+          if (msSHXReadSize(shpfile->hSHP, i) == 4) { /* handle NULL shape */
+              continue;
+          }
           return(MS_FAILURE);
+        }
 
         if(msRectOverlap(&shaperect, &rect) == MS_TRUE) msSetBit(shpfile->status, i, 1);
       }