Fix symbolObj.getImage seg fault in PHP/MapScript

MapServer · Aug 28, 2012 · c64d1bb · c64d1bb
1 parent 28592bf
commit c64d1bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -14,6 +14,8 @@ For a complete change history, please see the Git log comments.
 Current Version (future 6.2.0-beta2, GIT branch-6-2):
 -------------------------------------------------
 
+- Fix symbolObj.getImage seg fault in PHP/MapScript
+
 - Fix bad handling of startindex in some drivers (#4011)
 
 - Fixed bugs with WCS 1.1/2.0 with VSIMEM (#4369)

diff --git a/mapscript/php/mapscript_i.c b/mapscript/php/mapscript_i.c
@@ -1923,7 +1923,7 @@ void  outputFormatObj_destroy(outputFormatObj* self)
 
 imageObj *symbolObj_getImage(symbolObj *self, outputFormatObj *input_format)
 {
-  imageObj *image;
+  imageObj *image = NULL;
   outputFormatObj *format = NULL;
   rendererVTableObj *renderer = NULL;
 

diff --git a/mapscript/swiginc/symbol.i b/mapscript/swiginc/symbol.i
@@ -97,7 +97,7 @@
     %newobject getImage;
     imageObj *getImage(outputFormatObj *input_format)
     {
-        imageObj *image;
+        imageObj *image = NULL;
         outputFormatObj *format = NULL;
         rendererVTableObj *renderer = NULL;