[Fix #7798] (I)LIKE operator escapes regexp characters before computing regexp

m-kuhn · m-kuhn · commit 4d3b1841ceab · 2013-05-13T10:00:43.000+02:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -1936,10 +1936,11 @@ QVariant QgsExpression::NodeBinaryOperator::eval( QgsExpression* parent, QgsFeat
         bool matches;
         if ( mOp == boLike || mOp == boILike || mOp == boNotLike || mOp == boNotILike ) // change from LIKE syntax to regexp
         {
+          QString esc_regexp = QRegExp::escape( regexp );
           // XXX escape % and _  ???
-          regexp.replace( "%", ".*" );
-          regexp.replace( "_", "." );
-          matches = QRegExp( regexp, mOp == boLike || mOp == boNotLike ? Qt::CaseSensitive : Qt::CaseInsensitive ).exactMatch( str );
+          esc_regexp.replace( "%", ".*" );
+          esc_regexp.replace( "_", "." );
+          matches = QRegExp( esc_regexp, mOp == boLike || mOp == boNotLike ? Qt::CaseSensitive : Qt::CaseInsensitive ).exactMatch( str );
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -1936,10 +1936,11 @@ QVariant QgsExpression::NodeBinaryOperator::eval( QgsExpression* parent, QgsFeat`
`1936`	`1936`	`bool matches;`
`1937`	`1937`	`if ( mOp == boLike \|\| mOp == boILike \|\| mOp == boNotLike \|\| mOp == boNotILike ) // change from LIKE syntax to regexp`
`1938`	`1938`	`{`
	`1939`	`+ QString esc_regexp = QRegExp::escape( regexp );`
`1939`	`1940`	`// XXX escape % and _ ???`
`1940`		`- regexp.replace( "%", ".*" );`
`1941`		`- regexp.replace( "_", "." );`
`1942`		`- matches = QRegExp( regexp, mOp == boLike \|\| mOp == boNotLike ? Qt::CaseSensitive : Qt::CaseInsensitive ).exactMatch( str );`
	`1941`	`+ esc_regexp.replace( "%", ".*" );`
	`1942`	`+ esc_regexp.replace( "_", "." );`
	`1943`	`+ matches = QRegExp( esc_regexp, mOp == boLike \|\| mOp == boNotLike ? Qt::CaseSensitive : Qt::CaseInsensitive ).exactMatch( str );`
`1943`	`1944`	`}`
`1944`	`1945`	`else`
`1945`	`1946`	`{`