[mapserver-commits] r11526 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-11 09:23:31 -0700 (Mon, 11 Apr 2011)
New Revision: 11526

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maprendering.c
Log:
skip marker symbol with no defined SYMBOL (caused some memory leaks with
uninitialized vector points)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-11 16:03:00 UTC (rev 11525)
+++ trunk/mapserver/HISTORY.TXT	2011-04-11 16:23:31 UTC (rev 11526)
@@ -15,6 +15,9 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- skip marker symbol with no defined SYMBOL (caused some memory leaks with
+  uninitialized vector points)
+
 - fix crash in GD lines with floating point dash patterns (#3823)
 
 - Check renderer before using it when calculating label size (#3822)

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-04-11 16:03:00 UTC (rev 11525)
+++ trunk/mapserver/maprendering.c	2011-04-11 16:23:31 UTC (rev 11526)
@@ -679,7 +679,7 @@
    int ret = MS_SUCCESS;
    if (!p)
       return MS_SUCCESS;
-   if (style->symbol >= symbolset->numsymbols || style->symbol < 0)
+   if (style->symbol >= symbolset->numsymbols || style->symbol <= 0)
       return MS_SUCCESS; /* no such symbol, 0 is OK   */
 
    if (image)