[mapguide-commits] r9737 - trunk/MgDev/Server/src/Gws/GwsQueryEngine

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-09-19 09:03:50 -0700 (Sat, 19 Sep 2020)
New Revision: 9737

Modified:
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp
   trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
Log:
Plug several leaks in GwsQueryEngine. Reported by artem on mapguide-users mailing list.
 
Fixes #2825

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp	2020-09-19 15:40:27 UTC (rev 9736)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureSourceQuery.cpp	2020-09-19 16:03:50 UTC (rev 9737)
@@ -273,7 +273,8 @@
     //the Init() method of the command to avoid a describe schema call to the provider.
     if(pClassDef != NULL)
         pQuery->SetClassDefinition(pClassDef);
-    stat = pQuery->Init ( sellist, orderByCols, orderingOption, pFQuery->Filter ());
+    FdoPtr<FdoFilter> pFilter = pFQuery->Filter();
+    stat = pQuery->Init ( sellist, orderByCols, orderingOption, pFilter );
 
     if (IGWSException::IsError (stat)) {
         delete pQuery;

Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp	2020-09-19 15:40:27 UTC (rev 9736)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp	2020-09-19 16:03:50 UTC (rev 9737)
@@ -338,8 +338,10 @@
         }
 
         //compare the OrderBy lists
+        FdoPtr<FdoFilter> pFirstQueryFilter = firstQuery->Filter();
+        FdoPtr<FdoFilter> pSecondQueryFilter = secondQuery->Filter();
         if(!GwsQueryDefinitionXmlHelpers::CompareToStringValues(
-            firstQuery->Filter() , secondQuery->Filter()))
+            pFirstQueryFilter.p, pSecondQueryFilter.p))
         {
             break;
         }