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

[svn at osgeo.org]

Author: aboudreault
Date: 2012-02-02 11:45:26 -0800 (Thu, 02 Feb 2012)
New Revision: 13030

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapogcfilter.c
Log:
backport 6.0: WFS quote escape issue (#4087)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2012-02-02 16:38:56 UTC (rev 13029)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2012-02-02 19:45:26 UTC (rev 13030)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- WFS Quote Escape issue (#4087)
+
 - Raster layer fails to be drawn if the window is less than half a pixel (#4172)
 
 - Fixed SLD with FILTER doesn't apply properly to database layers (#4112)

Modified: branches/branch-6-0/mapserver/mapogcfilter.c
===================================================================
--- branches/branch-6-0/mapserver/mapogcfilter.c	2012-02-02 16:38:56 UTC (rev 13029)
+++ branches/branch-6-0/mapserver/mapogcfilter.c	2012-02-02 19:45:26 UTC (rev 13030)
@@ -2569,7 +2569,10 @@
         psFilterNode->psRightNode->pOther && 
         (*(int *)psFilterNode->psRightNode->pOther) == 1)
     {
-        snprintf(szTmp, sizeof(szTmp), "lower('%s') ", psFilterNode->psRightNode->pszValue);
+        char* pszEscapedStr;
+        pszEscapedStr = msLayerEscapeSQLParam(lp, psFilterNode->psRightNode->pszValue);
+        snprintf(szTmp, sizeof(szTmp), "lower('%s') ", pszEscapedStr);
+        msFree(pszEscapedStr);
         strlcat(szBuffer, szTmp, bufferSize);
     }
     else