Fix memory leak in msINLINELayerNextShape() and null pointer derefere…

…nce in maplexer when rerunning it after msCleanup() (fixes #5558)
MapServer · Sep 9, 2019 · 019a5b4 · 019a5b4
1 parent 336b6fb
commit 019a5b4
Show file tree

Hide file tree

Showing 6 changed files with 514 additions and 455 deletions.
diff --git a/maplayer.c b/maplayer.c
@@ -2227,6 +2227,7 @@ int msINLINELayerNextShape(layerObj *layer, shapeObj *shape)
         shape->values = (char **)msSmallRealloc(shape->values, sizeof(char *)*(layer->numitems));
         for (i = shape->numvalues; i < layer->numitems; i++)
           shape->values[i] = msStrdup("");
+        shape->numvalues = layer->numitems;
       }
 
       break;