[mapserver-commits] r8527 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-02-11 13:45:03 -0500 (Wed, 11 Feb 2009)
New Revision: 8527

Modified:
   trunk/mapserver/mapfile.c
Log:
deleted small double free

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2009-02-11 13:07:56 UTC (rev 8526)
+++ trunk/mapserver/mapfile.c	2009-02-11 18:45:03 UTC (rev 8527)
@@ -1423,6 +1423,7 @@
 #if defined (USE_GD_TTF) || defined (USE_GD_FT)
       if(label->bindings[MS_LABEL_BINDING_SIZE].item) {
         msFree(label->bindings[MS_LABEL_BINDING_SIZE].item);
+        label->bindings[MS_LABEL_BINDING_SIZE].item = NULL;
 	label->numbindings--;
       }
 
@@ -1432,8 +1433,6 @@
       if(symbol == MS_NUMBER) {
         label->size = (double) msyynumber;
       } else if(symbol == MS_BINDING) {
-        if (label->bindings[MS_LABEL_BINDING_SIZE].item != NULL)
-          msFree(label->bindings[MS_LABEL_BINDING_SIZE].item);
         label->bindings[MS_LABEL_BINDING_SIZE].item = strdup(msyytext);
         label->numbindings++;
       } else