[mapserver-commits] r11744 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-05-21 06:52:33 -0700 (Sat, 21 May 2011)
New Revision: 11744

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapogcfilter.c
Log:
Fix segfault on malformed <PropertyIsLike> filters (#3888)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-21 13:52:22 UTC (rev 11743)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-21 13:52:33 UTC (rev 11744)
@@ -15,6 +15,8 @@
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
 
+- Fix segfault on malformed <PropertyIsLike> filters (#3888)
+
 - Fixed the query handling problem with the Oracle spatial driver (#3878)
 
 - Fixed potential crash with AVERAGE resampling and crazy reprojection (#3886)

Modified: branches/branch-6-0/mapserver/mapogcfilter.c
===================================================================
--- branches/branch-6-0/mapserver/mapogcfilter.c	2011-05-21 13:52:22 UTC (rev 11743)
+++ branches/branch-6-0/mapserver/mapogcfilter.c	2011-05-21 13:52:33 UTC (rev 11744)
@@ -1409,7 +1409,7 @@
                     psFilterNode->psLeftNode = FLTCreateFilterEncodingNode();
 
                     psTmpNode = CPLSearchXMLNode(psXMLNode,  "PropertyName");
-                    if (psTmpNode &&  psXMLNode->psChild && 
+                    if (psTmpNode &&  psTmpNode->psChild &&
                         psTmpNode->psChild->pszValue && 
                         strlen(psTmpNode->psChild->pszValue) > 0)
                     
@@ -1431,7 +1431,7 @@
 
                     
                     psTmpNode = CPLSearchXMLNode(psXMLNode,  "Literal");
-                    if (psTmpNode &&  psXMLNode->psChild && 
+                    if (psTmpNode &&  psTmpNode->psChild &&
                         psTmpNode->psChild->pszValue && 
                         strlen(psTmpNode->psChild->pszValue) > 0)
                     {