Handle null shapes in msShapefileWhichShapes (#6521)

szekerest · github-actions[bot] · commit e4b27656f400 · 2022-05-02T20:36:46.000Z
diff --git a/mapshape.c b/mapshape.c
@@ -1877,8 +1877,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);
       }

Original file line number	Diff line number	Diff line change
`@@ -1877,8 +1877,12 @@ int msShapefileWhichShapes(shapefileObj *shpfile, rectObj rect, int debug)`
`1877`	`1877`	`}`
`1878`	`1878`
`1879`	`1879`	`for(i=0; i<shpfile->numshapes; i++) {`
`1880`		`- if(msSHPReadBounds(shpfile->hSHP, i, &shaperect) != MS_SUCCESS)`
	`1880`	`+ if(msSHPReadBounds(shpfile->hSHP, i, &shaperect) != MS_SUCCESS) {`
	`1881`	`+ if (msSHXReadSize(shpfile->hSHP, i) == 4) { /* handle NULL shape */`
	`1882`	`+ continue;`
	`1883`	`+ }`
`1881`	`1884`	`return(MS_FAILURE);`
	`1885`	`+ }`
`1882`	`1886`
`1883`	`1887`	`if(msRectOverlap(&shaperect, &rect) == MS_TRUE) msSetBit(shpfile->status, i, 1);`
`1884`	`1888`	`}`