Fix crash on legend icon with offset generation (#4790)

tbonfort · tbonfort · commit c217944d3f65 · 2013-10-13T10:23:57.000+02:00
diff --git a/maplegend.c b/maplegend.c
@@ -119,6 +119,7 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
   }
 
   /* initialize the box used for polygons and for outlines */
+  msInitShape(&box);
   box.line = (lineObj *)msSmallMalloc(sizeof(lineObj));
   box.numlines = 1;
   box.line[0].point = (pointObj *)msSmallMalloc(sizeof(pointObj)*5);
@@ -244,6 +245,7 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
         else
             offset = theclass->styles[0]->width/2;
       }
+      msInitShape(&zigzag);
       zigzag.line = (lineObj *)msSmallMalloc(sizeof(lineObj));
       zigzag.numlines = 1;
       zigzag.line[0].point = (pointObj *)msSmallMalloc(sizeof(pointObj)*4);

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ int msDrawLegendIcon(mapObj map, layerObj lp, classObj *theclass,`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/* initialize the box used for polygons and for outlines */`
	`122`	`+ msInitShape(&box);`
`122`	`123`	`box.line = (lineObj *)msSmallMalloc(sizeof(lineObj));`
`123`	`124`	`box.numlines = 1;`
`124`	`125`	`box.line[0].point = (pointObj )msSmallMalloc(sizeof(pointObj)5);`
`@@ -244,6 +245,7 @@ int msDrawLegendIcon(mapObj map, layerObj lp, classObj *theclass,`
`244`	`245`	`else`
`245`	`246`	`offset = theclass->styles[0]->width/2;`
`246`	`247`	`}`
	`248`	`+ msInitShape(&zigzag);`
`247`	`249`	`zigzag.line = (lineObj *)msSmallMalloc(sizeof(lineObj));`
`248`	`250`	`zigzag.numlines = 1;`
`249`	`251`	`zigzag.line[0].point = (pointObj )msSmallMalloc(sizeof(pointObj)4);`