[mapserver-commits] r12981 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2012-01-11 19:59:14 -0800 (Wed, 11 Jan 2012)
New Revision: 12981

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
Fixed segfault in ogcfilter when loading sld

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2012-01-10 17:02:53 UTC (rev 12980)
+++ trunk/mapserver/mapogcfilter.c	2012-01-12 03:59:14 UTC (rev 12981)
@@ -701,13 +701,13 @@
 	if(lp->filter.string && lp->filter.type == MS_EXPRESSION)
 	  pszBuffer = msStringConcatenate(pszBuffer, ")");
         
-        escapedTextString = msStringEscape(pszBuffer); 
-	pszTmp =  (char *)msSmallMalloc(sizeof(char)*(strlen(lp->filter.string)+3));
+        escapedTextString = msStringEscape(pszBuffer);
+	pszTmp =  (char *)msSmallMalloc(sizeof(char)*(strlen(escapedTextString)+3));
 	sprintf(pszTmp,"\"%s\"",escapedTextString);
 	msLoadExpressionString(&lp->filter, pszTmp);
 	free(pszTmp);
         /*msLoadExpressionString(&lp->filter,  (char*)CPLSPrintf("\"%s\"", escapedTextString)); */
-        free(escapedTextString); 
+        free(escapedTextString);
         free(szExpression);
     }