PostGIS: call msLayerTranslateFilter() in msPostGISLayerGetShapeCount…

…(), and fix memory leaks in msPostGISBuildSQLWhere()
rouault · Feb 10, 2016 · 4557afe · 4557afe
1 parent 2514786
commit 4557afe
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mappostgis.c b/mappostgis.c
@@ -2079,6 +2079,7 @@ char *msPostGISBuildSQLWhere(layerObj *layer, rectObj *rect, long *uid, rectObj
       strTmp = msStringConcatenate(strTmp, ")");
 
       msFree(strRect);
+      msFree(strRectOtherSRID);
       strRect = strTmp;
       strRectLength = strlen(strRect);
     }
@@ -2117,6 +2118,7 @@ char *msPostGISBuildSQLWhere(layerObj *layer, rectObj *rect, long *uid, rectObj
       strTmp = msStringConcatenate(strTmp, ")");
 
       msFree(strRect);
+      msFree(strRectOtherSRID);
       strRect = strTmp;
       strRectLength = strlen(strRect);
     }
@@ -2933,6 +2935,8 @@ int msPostGISLayerGetShapeCount(layerObj *layer, rectObj rect, projectionObj *re
   }
 #endif
 
+  msLayerTranslateFilter(layer, &layer->filter, layer->filteritem);
+
   /* Fill out layerinfo with our current DATA state. */
   if ( msPostGISParseData(layer) != MS_SUCCESS) {
     return -1;