Merge pull request #5944 from alexbrault/5941-nested-symbolset-leak

Support nested SYMBOLSETs without leaking (Fixes #5941 and #5942)

mapsymbol.c

@@ -558,6 +558,7 @@ int loadSymbolSet(symbolSetObj *symbolset, mapObj *map)
   char szPath[MS_MAXPATHLEN], *pszSymbolPath=NULL;
 
   int foundSymbolSetToken=MS_FALSE;
+  int symbolSetLevel=0;
   int token;
 
   if(!symbolset) {
@@ -598,12 +599,20 @@ int loadSymbolSet(symbolSetObj *symbolset, mapObj *map)
 
     switch(token) {
       case(END):
+        if (--symbolSetLevel < 0) {
+          msSetError(MS_IDENTERR, "END token found outside SYMBOLSET context. When nesting multiple SYMBOLSETs, make sure the SYMBOLSET/END pairs match.", "msLoadSymbolSet()");
+          status = -1;
+        }
+        break;
       case(EOF):
         status = 0;
         break;
       case(SYMBOL):
         /* Allocate/init memory for new symbol if needed */
-        if (msGrowSymbolSet(symbolset) == NULL) {
+        if (symbolSetLevel == 0) {
+          msSetError(MS_IDENTERR, "SYMBOL token found outside SYMBOLSET context. When nesting multiple SYMBOLSETs, make sure the SYMBOLSET/END pairs match.", "msLoadSymbolSet()");
+          status = -1;
+        } else if (msGrowSymbolSet(symbolset) == NULL) {
           status = -1;
         } else if((loadSymbol((symbolset->symbol[symbolset->numsymbols]), pszSymbolPath) == -1))
           status = -1;
@@ -612,6 +621,7 @@ int loadSymbolSet(symbolSetObj *symbolset, mapObj *map)
         break;
       case(SYMBOLSET):
         foundSymbolSetToken = MS_TRUE;
+        symbolSetLevel++;
         break;
       default:
         msSetError(MS_IDENTERR, "Parsing error near (%s):(line %d)", "loadSymbolSet()", msyystring_buffer, msyylineno);

msautotest/misc/empty_symbolset

@@ -0,0 +1,2 @@
+SYMBOLSET
+END

msautotest/misc/nested_symbolset.map

@@ -0,0 +1,34 @@
+#
+# Test that nested symbolsets are parsed completely
+#
+MAP
+
+IMAGETYPE PNG
+SIZE 10 10
+EXTENT 0 0 400 300
+SHAPEPATH "../misc/data"
+FONTSET "../misc/fonts.lst"
+SYMBOLSET "root_nested_symbolset"
+
+LAYER
+    TYPE POINT
+
+  STATUS ON
+  CLASS
+    NAME "test1"
+    STYLE
+        SYMBOL "vector arrow"
+        COLOR 0 0 0
+        SIZE 5
+        ANGLE 45
+    END
+  END
+
+  FEATURE
+    POINTS
+        200 200
+    END
+  END
+END
+
+END

msautotest/misc/root_nested_symbolset

@@ -0,0 +1,4 @@
+SYMBOLSET
+  INCLUDE 'empty_symbolset'
+  INCLUDE '../renderers/symbolset'
+END