mapwfs.c: correctly pair CPL allocation routines with CPL free routines

MapServer · Apr 11, 2013 · c0f8907 · c0f8907
1 parent 092c6d7
commit c0f8907
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/mapwfs.c b/mapwfs.c
@@ -34,6 +34,7 @@
 
 /* There is a dependency to GDAL/OGR for the GML driver and MiniXML parser */
 #include "cpl_minixml.h"
+#include "cpl_conv.h"
 
 #include "mapogcfilter.h"
 #include "mapowscommon.h"
@@ -3245,14 +3246,17 @@ int msWFSParseRequest(mapObj *map, cgiRequestObj *request, owsRequestObj *ows_re
             psFilter = CPLGetXMLNode(psQuery, "Filter");
 
             if (psFilter) {
-              if (!bMultiLayer)
+              if (!bMultiLayer) {
-                wfsparams->pszFilter = CPLSerializeXMLTree(psFilter);
+                char* pszCPLTmp = CPLSerializeXMLTree(psFilter);
+                wfsparams->pszFilter = msStrdup(pszCPLTmp);
+                CPLFree(pszCPLTmp);
+              }
               else {
                 pszSerializedFilter = CPLSerializeXMLTree(psFilter);
                 pszTmp = (char *)msSmallMalloc(sizeof(char)*
                                                (strlen(pszSerializedFilter)+3));
                 sprintf(pszTmp, "(%s)", pszSerializedFilter);
-                free(pszSerializedFilter);
+                CPLFree(pszSerializedFilter);
 
                 if (wfsparams->pszFilter == NULL)
                   wfsparams->pszFilter = msStrdup(pszTmp);