fix memory leaks on wms testcases

tbonfort · tbonfort · commit dadbfad2db05 · 2012-09-17T14:53:03.000+02:00
diff --git a/mapgeos.c b/mapgeos.c
@@ -239,6 +239,7 @@ static GEOSGeom msGEOSShape2Geometry_polygon(shapeObj *shape)
     }
 
     g = GEOSGeom_createCollection(GEOS_MULTIPOLYGON, polygons, numOuterRings);
+    free(polygons);
   }
 
   free(outerList);
diff --git a/mapogcfiltercommon.c b/mapogcfiltercommon.c
@@ -536,21 +536,22 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
     pszExpression = msStringConcatenate(pszExpression, szBuffer);
 
 
-    if (strncasecmp(psNode->pszValue, "intersect", 9) == 0)
-      pszTmp = msStrdup("intersects");
-    if (strncasecmp(psNode->pszValue, "equals", 6) == 0)
-      pszTmp = msStrdup("eq");
-    else
-      pszTmp = msStrdup(psNode->pszValue);
-    msStringToLower(pszTmp);
-    if (bBBoxQuery)
+    if (bBBoxQuery) {
       sprintf(szBuffer, " %s ", "intersects");
-    /* sprintf(szBuffer, " %s ", "disjoint"); */
-    else
-      sprintf(szBuffer, " %s ", pszTmp);
+    } else {
+      if (strncasecmp(psNode->pszValue, "intersect", 9) == 0)
+        sprintf(szBuffer, " %s ", "intersects");
+      else if (strncasecmp(psNode->pszValue, "equals", 6) == 0)
+        sprintf(szBuffer, " %s ", "eq");
+      else {
+        pszTmp = msStrdup(psNode->pszValue);
+        msStringToLower(pszTmp);
+        sprintf(szBuffer, " %s ", pszTmp);
+        msFree(pszTmp);
+      }
+    }
 
     pszExpression = msStringConcatenate(pszExpression, szBuffer);
-    msFree(pszTmp);
 
     pszWktText = msGEOSShapeToWKT(psTmpShape);
     sprintf(szBuffer, "%s", " fromText('");
@@ -560,8 +561,14 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
     pszExpression = msStringConcatenate(pszExpression, szBuffer);
     msGEOSFreeWKT(pszWktText);
   }
-  if (psBufferShape)
+  if (psBufferShape) {
     msFreeShape(psBufferShape);
+    msFree(psBufferShape);
+  }
+  if(bBBoxQuery) {
+     msFreeShape(psTmpShape);
+     msFree(psTmpShape);
+  }
 
 
   sprintf(szBuffer, "%s", ")");
diff --git a/mapogcsld.c b/mapogcsld.c
@@ -185,6 +185,7 @@ int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer,
           msFree(pasLayers[l].name);
           pasLayers[l].name = strdup(tmpId);
           msInsertLayer(map, psTmpLayer, -1);
+          MS_REFCNT_DECR(psTmpLayer);
         }
       }
     }
@@ -238,8 +239,7 @@ int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer,
 
             /*unset the classgroup on the layer if it was set. This allows the layer to render
               with all the classes defined in the SLD*/
-            if (GET_LAYER(map, i)->classgroup)
-              msFree(GET_LAYER(map, i)->classgroup);
+            msFree(GET_LAYER(map, i)->classgroup);
             GET_LAYER(map, i)->classgroup = NULL;
 
             iClass = 0;
@@ -290,8 +290,7 @@ int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer,
                   break;
               }
               if (k < GET_LAYER(map, i)->numclasses) {
-                if ( GET_LAYER(map, i)->classgroup)
-                  msFree( GET_LAYER(map, i)->classgroup);
+                msFree( GET_LAYER(map, i)->classgroup);
                 GET_LAYER(map, i)->classgroup = msStrdup(pasLayers[j].classgroup);
               } else {
                 /* TODO  we throw an exception ?*/
@@ -774,12 +773,14 @@ int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *psLayer)
           psFilter = CPLGetXMLNode(psRule, "Filter");
           if (psFilter && psFilter->psChild &&
               psFilter->psChild->pszValue) {
-
+            CPLXMLNode *psTmpNextNode = NULL;
             /* clone the tree and set the next node to null */
             /* so we only have the Filter node */
             psTmpNode = CPLCloneXMLTree(psFilter);
+            psTmpNextNode = psTmpNode->psNext;
             psTmpNode->psNext = NULL;
             pszTmpFilter = CPLSerializeXMLTree(psTmpNode);
+            psTmpNode->psNext = psTmpNextNode;
             CPLDestroyXMLNode(psTmpNode);
 
             if (pszTmpFilter) {
@@ -888,8 +889,10 @@ int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *psLayer)
     psNamedStyle = CPLGetXMLNode(psRoot, "NamedStyle");
     if (psNamedStyle) {
       psSLDName = CPLGetXMLNode(psNamedStyle, "Name");
-      if (psSLDName && psSLDName->psChild &&  psSLDName->psChild->pszValue)
+      if (psSLDName && psSLDName->psChild &&  psSLDName->psChild->pszValue) {
+        msFree(psLayer->classgroup);
         psLayer->classgroup = msStrdup(psSLDName->psChild->pszValue);
+      }
     }
   }
 
@@ -1573,15 +1576,17 @@ int msSLDParseGraphicFillOrStroke(CPLXMLNode *psRoot,
 
       /* default symbol is square */
 
-      if (!pszSymbolName ||
+      if (!pszSymbolName || !*pszSymbolName || 
           (strcasecmp(pszSymbolName, "square") != 0 &&
            strcasecmp(pszSymbolName, "circle") != 0 &&
            strcasecmp(pszSymbolName, "triangle") != 0 &&
            strcasecmp(pszSymbolName, "star") != 0 &&
            strcasecmp(pszSymbolName, "cross") != 0 &&
            strcasecmp(pszSymbolName, "x") != 0)) {
-        if (msGetSymbolIndex(&map->symbolset, pszSymbolName,  MS_FALSE) < 0)
+        if (!pszSymbolName || !*pszSymbolName || msGetSymbolIndex(&map->symbolset, pszSymbolName,  MS_FALSE) < 0) {
+          msFree(pszSymbolName);
           pszSymbolName = msStrdup("square");
+        }
       }
 
 
@@ -1712,6 +1717,7 @@ int msSLDParseGraphicFillOrStroke(CPLXMLNode *psRoot,
       if (psExternalGraphic)
         msSLDParseExternalGraphic(psExternalGraphic, psStyle, map);
     }
+    msFree(pszSymbolName);
   }
 
   return MS_SUCCESS;
diff --git a/mapserver.h b/mapserver.h
@@ -2729,8 +2729,8 @@ extern "C" {
   MS_DLL_EXPORT int msPopulateRendererVTableGD( rendererVTableObj *renderer );
   MS_DLL_EXPORT int msPopulateRendererVTableKML( rendererVTableObj *renderer );
   MS_DLL_EXPORT int msPopulateRendererVTableOGR( rendererVTableObj *renderer );
-#ifdef CAIRO
-  MS_DLL_EXPORT void msCairoCleanup();
+#ifdef USE_CAIRO
+  MS_DLL_EXPORT void msCairoCleanup(void);
 #endif
 
   /* allocate 50k for starters */
diff --git a/mapwms.c b/mapwms.c
@@ -198,9 +198,8 @@ int msWMSException(mapObj *map, int nVersion, const char *exception_code,
     msIO_printf("</ServiceException>\n");
     msIO_printf("</ServiceExceptionReport>\n");
 
-    free(schemalocation);
-
   }
+  free(schemalocation);
 
   return MS_FAILURE; /* so that we can call 'return msWMSException();' anywhere */
 }
@@ -637,14 +636,14 @@ int msWMSValidateDimensionValue(char *value, const char *dimensionextent, int fo
             }
             if (j == nextentranges) {
               valueisvalid = MS_FALSE;
+              msFreeCharArray(onerange, ntmp);
               break;
             }
           }
         } else {
           valueisvalid = MS_FALSE;
         }
-        if (onerange && ntmp > 0)
-          msFreeCharArray(onerange, ntmp);
+        msFreeCharArray(onerange, ntmp);
       }
       uservaluevalid = valueisvalid;
     }
@@ -858,6 +857,8 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
 
       layers = msStringSplit(values[i], ',', &numlayers);
       if (layers==NULL || strlen(values[i]) <=0 ||   numlayers < 1) {
+        msFreeCharArray(layers,numlayers);
+        msFree(layerOrder);
         numlayers = 0;
         if (sld_url == NULL &&   sld_body == NULL) {
           msSetError(MS_WMSERR, "At least one layer name required in LAYERS.",
@@ -870,6 +871,8 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
         layerlimit = msOWSLookupMetadata(&(map->web.metadata), "MO", "layerlimit");
         if(layerlimit) {
           if (numlayers > atoi(layerlimit)) {
+            msFreeCharArray(layers,numlayers);
+            msFree(layerOrder);
             msSetError(MS_WMSERR, "Number of layers requested exceeds LayerLimit.",
                        "msWMSLoadGetMapParams()");
             return msWMSException(map, nVersion, NULL, wms_exception_format);
@@ -1244,12 +1247,16 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
                                        wms_exception_format)) {
                 msFreeCharArray(tokens, ntokens);
                 msFree(dimensionname);
+                msFree(stmp);
 
                 return msWMSException(lp->map, nVersion, "InvalidDimensionValue",  wms_exception_format);
               }
+              msFree(dimensionname);
+              msFree(stmp);
               break;
             }
             msFree(dimensionname);
+            msFree(stmp);
           }
         }
         msFreeCharArray(tokens, ntokens);
@@ -1583,6 +1590,8 @@ this request. Check wms/ows_enable_request settings.",
                   layers[l] = strdup(tmpId);
                   msInsertLayer(map, psTmpLayer, -1);
                   bLayerInserted =MS_TRUE;
+                  /* layer was copied, we need to decrement its refcount */
+                  MS_REFCNT_DECR(psTmpLayer);
                 }
               }
             }
@@ -1602,8 +1611,7 @@ this request. Check wms/ows_enable_request settings.",
               lp =   GET_LAYER(map, j);
               for (k=0; k<lp->numclasses; k++) {
                 if (lp->class[k]->group && strcasecmp(lp->class[k]->group, tokens[i]) == 0) {
-                  if (lp->classgroup)
-                    msFree(lp->classgroup);
+                  msFree(lp->classgroup);
                   lp->classgroup = msStrdup( tokens[i]);
                   break;
                 }
@@ -1640,16 +1648,14 @@ this request. Check wms/ows_enable_request settings.",
         } else {
           msSetError(MS_WMSERR, "Invalid style (%s). Mapserver is expecting an empty string for the STYLES : STYLES= or STYLES=,,, or using keyword default  STYLES=default,default, ...",
                      "msWMSLoadGetMapParams()", styles);
-          if (tokens && n > 0)
-            msFreeCharArray(tokens, n);
-          if (layers && numlayers > 0)
-            msFreeCharArray(layers, numlayers);
+          msFreeCharArray(tokens, n);
+          msFreeCharArray(layers, numlayers);
           return msWMSException(map, nVersion, "StyleNotDefined", wms_exception_format);
         }
       }
     }
-    if (tokens && n > 0)
-      msFreeCharArray(tokens, n);
+    msFreeCharArray(tokens, n);
+    msFreeCharArray(layers, numlayers);
   }
 
   /*
@@ -2227,6 +2233,7 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
         msFree(pszDimension);
         msFree(pszDimensionItemName);
         msFree(pszDimensionUnitName);
+        msFree(pszDimensionExtentName);
         msFree(pszDimensionDefaultName);
 
       }
@@ -4505,8 +4512,7 @@ this request. Check wms/ows_enable_request settings.",
                  "msWMSGetLegendGraphic()");
       return msWMSException(map, nVersion, "StyleNotDefined", wms_exception_format);
     } else {
-      if (GET_LAYER(map, iLayerIndex)->classgroup)
-        msFree(GET_LAYER(map, iLayerIndex)->classgroup);
+      msFree(GET_LAYER(map, iLayerIndex)->classgroup);
       GET_LAYER(map, iLayerIndex)->classgroup = msStrdup(pszStyle);
 
     }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@ static GEOSGeom msGEOSShape2Geometry_polygon(shapeObj *shape)`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`g = GEOSGeom_createCollection(GEOS_MULTIPOLYGON, polygons, numOuterRings);`
	`242`	`+ free(polygons);`
`242`	`243`	`}`
`243`	`244`
`244`	`245`	`free(outerList);`
Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,8 @@ int msWMSException(mapObj map, int nVersion, const char exception_code,`
`198`	`198`	`msIO_printf("</ServiceException>\n");`
`199`	`199`	`msIO_printf("</ServiceExceptionReport>\n");`
`200`	`200`
`201`		`- free(schemalocation);`
`202`		`-`
`203`	`201`	`}`
	`202`	`+ free(schemalocation);`
`204`	`203`
`205`	`204`	`return MS_FAILURE; /* so that we can call 'return msWMSException();' anywhere */`
`206`	`205`	`}`
`@@ -637,14 +636,14 @@ int msWMSValidateDimensionValue(char value, const char dimensionextent, int fo`
`637`	`636`	`}`
`638`	`637`	`if (j == nextentranges) {`
`639`	`638`	`valueisvalid = MS_FALSE;`
	`639`	`+ msFreeCharArray(onerange, ntmp);`
`640`	`640`	`break;`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`	`} else {`
`644`	`644`	`valueisvalid = MS_FALSE;`
`645`	`645`	`}`
`646`		`- if (onerange && ntmp > 0)`
`647`		`- msFreeCharArray(onerange, ntmp);`
	`646`	`+ msFreeCharArray(onerange, ntmp);`
`648`	`647`	`}`
`649`	`648`	`uservaluevalid = valueisvalid;`
`650`	`649`	`}`
`@@ -858,6 +857,8 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,`
`858`	`857`
`859`	`858`	`layers = msStringSplit(values[i], ',', &numlayers);`
`860`	`859`	`if (layers==NULL \|\| strlen(values[i]) <=0 \|\| numlayers < 1) {`
	`860`	`+ msFreeCharArray(layers,numlayers);`
	`861`	`+ msFree(layerOrder);`
`861`	`862`	`numlayers = 0;`
`862`	`863`	`if (sld_url == NULL && sld_body == NULL) {`
`863`	`864`	`msSetError(MS_WMSERR, "At least one layer name required in LAYERS.",`
`@@ -870,6 +871,8 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,`
`870`	`871`	`layerlimit = msOWSLookupMetadata(&(map->web.metadata), "MO", "layerlimit");`
`871`	`872`	`if(layerlimit) {`
`872`	`873`	`if (numlayers > atoi(layerlimit)) {`
	`874`	`+ msFreeCharArray(layers,numlayers);`
	`875`	`+ msFree(layerOrder);`
`873`	`876`	`msSetError(MS_WMSERR, "Number of layers requested exceeds LayerLimit.",`
`874`	`877`	`"msWMSLoadGetMapParams()");`
`875`	`878`	`return msWMSException(map, nVersion, NULL, wms_exception_format);`
`@@ -1244,12 +1247,16 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,`
`1244`	`1247`	`wms_exception_format)) {`
`1245`	`1248`	`msFreeCharArray(tokens, ntokens);`
`1246`	`1249`	`msFree(dimensionname);`
	`1250`	`+ msFree(stmp);`
`1247`	`1251`
`1248`	`1252`	`return msWMSException(lp->map, nVersion, "InvalidDimensionValue", wms_exception_format);`
`1249`	`1253`	`}`
	`1254`	`+ msFree(dimensionname);`
	`1255`	`+ msFree(stmp);`
`1250`	`1256`	`break;`
`1251`	`1257`	`}`
`1252`	`1258`	`msFree(dimensionname);`
	`1259`	`+ msFree(stmp);`
`1253`	`1260`	`}`
`1254`	`1261`	`}`
`1255`	`1262`	`msFreeCharArray(tokens, ntokens);`
`@@ -1583,6 +1590,8 @@ this request. Check wms/ows_enable_request settings.",`
`1583`	`1590`	`layers[l] = strdup(tmpId);`
`1584`	`1591`	`msInsertLayer(map, psTmpLayer, -1);`
`1585`	`1592`	`bLayerInserted =MS_TRUE;`
	`1593`	`+ /* layer was copied, we need to decrement its refcount */`
	`1594`	`+ MS_REFCNT_DECR(psTmpLayer);`
`1586`	`1595`	`}`
`1587`	`1596`	`}`
`1588`	`1597`	`}`
`@@ -1602,8 +1611,7 @@ this request. Check wms/ows_enable_request settings.",`
`1602`	`1611`	`lp = GET_LAYER(map, j);`
`1603`	`1612`	`for (k=0; k<lp->numclasses; k++) {`
`1604`	`1613`	`if (lp->class[k]->group && strcasecmp(lp->class[k]->group, tokens[i]) == 0) {`
`1605`		`- if (lp->classgroup)`
`1606`		`- msFree(lp->classgroup);`
	`1614`	`+ msFree(lp->classgroup);`
`1607`	`1615`	`lp->classgroup = msStrdup( tokens[i]);`
`1608`	`1616`	`break;`
`1609`	`1617`	`}`
`@@ -1640,16 +1648,14 @@ this request. Check wms/ows_enable_request settings.",`
`1640`	`1648`	`} else {`
`1641`	`1649`	`msSetError(MS_WMSERR, "Invalid style (%s). Mapserver is expecting an empty string for the STYLES : STYLES= or STYLES=,,, or using keyword default STYLES=default,default, ...",`
`1642`	`1650`	`"msWMSLoadGetMapParams()", styles);`
`1643`		`- if (tokens && n > 0)`
`1644`		`- msFreeCharArray(tokens, n);`
`1645`		`- if (layers && numlayers > 0)`
`1646`		`- msFreeCharArray(layers, numlayers);`
	`1651`	`+ msFreeCharArray(tokens, n);`
	`1652`	`+ msFreeCharArray(layers, numlayers);`
`1647`	`1653`	`return msWMSException(map, nVersion, "StyleNotDefined", wms_exception_format);`
`1648`	`1654`	`}`
`1649`	`1655`	`}`
`1650`	`1656`	`}`
`1651`		`- if (tokens && n > 0)`
`1652`		`- msFreeCharArray(tokens, n);`
	`1657`	`+ msFreeCharArray(tokens, n);`
	`1658`	`+ msFreeCharArray(layers, numlayers);`
`1653`	`1659`	`}`
`1654`	`1660`
`1655`	`1661`	`/*`
`@@ -2227,6 +2233,7 @@ int msDumpLayer(mapObj map, layerObj lp, int nVersion, const char *script_url_`
`2227`	`2233`	`msFree(pszDimension);`
`2228`	`2234`	`msFree(pszDimensionItemName);`
`2229`	`2235`	`msFree(pszDimensionUnitName);`
	`2236`	`+ msFree(pszDimensionExtentName);`
`2230`	`2237`	`msFree(pszDimensionDefaultName);`
`2231`	`2238`
`2232`	`2239`	`}`
`@@ -4505,8 +4512,7 @@ this request. Check wms/ows_enable_request settings.",`
`4505`	`4512`	`"msWMSGetLegendGraphic()");`
`4506`	`4513`	`return msWMSException(map, nVersion, "StyleNotDefined", wms_exception_format);`
`4507`	`4514`	`} else {`
`4508`		`- if (GET_LAYER(map, iLayerIndex)->classgroup)`
`4509`		`- msFree(GET_LAYER(map, iLayerIndex)->classgroup);`
	`4515`	`+ msFree(GET_LAYER(map, iLayerIndex)->classgroup);`
`4510`	`4516`	`GET_LAYER(map, iLayerIndex)->classgroup = msStrdup(pszStyle);`
`4511`	`4517`
`4512`	`4518`	`}`