[mapserver-commits] r11551 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-13 07:39:28 -0700 (Wed, 13 Apr 2011)
New Revision: 11551

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapcairo.c
Log:
fix crashes in SVG renderer on polygon symbol fills (#3837)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-13 12:53:12 UTC (rev 11550)
+++ trunk/mapserver/HISTORY.TXT	2011-04-13 14:39:28 UTC (rev 11551)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- fix crashes in SVG renderer on polygon symbol fills (#3837)
+
 - fix crash/corruptions with raster layers in pdf outputs (#3799)
 
 - fix memory leak in msFreeLabelCacheSlot (#3829)

Modified: trunk/mapserver/mapcairo.c
===================================================================
--- trunk/mapserver/mapcairo.c	2011-04-13 12:53:12 UTC (rev 11550)
+++ trunk/mapserver/mapcairo.c	2011-04-13 14:39:28 UTC (rev 11551)
@@ -129,8 +129,9 @@
 int freeImageCairo(imageObj *img) {
     cairo_renderer *r = CAIRO_RENDERER(img);
     if(r) {
+        cairo_destroy(r->cr);
+        cairo_surface_finish(r->surface);
         cairo_surface_destroy(r->surface);
-        cairo_destroy(r->cr);
         if(r->outputStream) {
             msBufferFree(r->outputStream);
             free(r->outputStream);