msLoadMap(): fix memleak in error code path related to style loading

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52124
MapServer · Oct 6, 2022 · 5152f14 · 5152f14
1 parent f60c84e
commit 5152f14
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mapfile.c b/mapfile.c
@@ -1789,7 +1789,12 @@ static int loadLabel(labelObj *label)
         if(msGrowLabelStyles(label) == NULL)
           return(-1);
         initStyle(label->styles[label->numstyles]);
-        if(loadStyle(label->styles[label->numstyles]) != MS_SUCCESS) return(-1);
+        if(loadStyle(label->styles[label->numstyles]) != MS_SUCCESS) {
+            freeStyle(label->styles[label->numstyles]);
+            free(label->styles[label->numstyles]);
+            label->styles[label->numstyles] = NULL;
+            return(-1);
+        }
         if(label->styles[label->numstyles]->_geomtransform.type == MS_GEOMTRANSFORM_NONE)
           label->styles[label->numstyles]->_geomtransform.type = MS_GEOMTRANSFORM_LABELPOINT; /* set a default, a marker? */
         label->numstyles++;