Fix pixmap loading issue (#4329)

MapServer · May 29, 2012 · 33a02b6 · 33a02b6
1 parent b6751ec
commit 33a02b6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mapsymbol.c b/mapsymbol.c
@@ -791,8 +791,12 @@ int msPreloadImageSymbol(rendererVTableObj *renderer, symbolObj *symbol) {
 	} else {
 		symbol->pixmap_buffer = (rasterBufferObj*)calloc(1,sizeof(rasterBufferObj));
 	}
-	if(MS_SUCCESS != renderer->loadImageFromFile(symbol->full_pixmap_path, symbol->pixmap_buffer))
-		return MS_FAILURE;
+	if(MS_SUCCESS != renderer->loadImageFromFile(symbol->full_pixmap_path, symbol->pixmap_buffer)) {
+            /* Free pixmap_buffer already allocated */
+            free(symbol->pixmap_buffer);
+            symbol->pixmap_buffer = NULL;
+            return MS_FAILURE;
+        }
 	symbol->renderer = renderer;
 	symbol->sizex = symbol->pixmap_buffer->width;
 	symbol->sizey = symbol->pixmap_buffer->height;