Merge pull request #6713 from rouault/wfs_filter_quote

WFS/CSW: do not remove single or double quote character in a LIKE filter
OSGeo · Nov 16, 2022 · b549517 · b549517
2 parents b9ef6b4 + a01d852
commit b549517
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp
@@ -300,7 +300,6 @@ static bool WFS_ExprDumpAsOGCFilter( CPLString& osFilter,
         poExpr->nOperation == SWQ_ILIKE )
     {
         CPLString osVal;
-        char firstCh = 0;
         const char* pszMatchCase =
             poExpr->nOperation == SWQ_LIKE &&
                 !CPLTestBool(CPLGetConfigOption("OGR_SQL_LIKE_AS_ILIKE", "FALSE")) ? "true" : "false";
@@ -319,23 +318,15 @@ static bool WFS_ExprDumpAsOGCFilter( CPLString& osFilter,
 
         // Escape value according to above special characters.  For URL
         // compatibility reason, we remap the OGR SQL '%' wildcard into '*'.
-        int i = 0;
-        char ch = poExpr->papoSubExpr[1]->string_value[i];
-        if (ch == '\'' || ch == '"')
-        {
-            firstCh = ch;
-            i ++;
-        }
-        for(;(ch = poExpr->papoSubExpr[1]->string_value[i]) != '\0';i++)
+        char ch;
+        for(int i = 0;(ch = poExpr->papoSubExpr[1]->string_value[i]) != '\0';i++)
         {
             if (ch == '%')
                 osVal += "*";
             else if (ch == '!')
                 osVal += "!!";
             else if (ch == '*')
                 osVal += "!*";
-            else if (ch == firstCh && poExpr->papoSubExpr[1]->string_value[i + 1] == 0)
-                break;
             else
             {
                 char ach[2];