[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-08-30 15:44:45
Message-ID: 20100830154445.3ECC0AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170035 by orlovich:

Merged revision:r1170033 | orlovich | 2010-08-30 11:43:04 -0400 (Mon, 30 Aug 2010) | 10 lines

At least don't intrepret ? as a wildcard in strings that don't have *. We really 
should escape it even if they do (using WildcardUnix), but QRegExp's wildcard parsing looks so busted 
my brain is rebelling against writing a guaranteed-to-be-wrong escaping function --- probably being 
overpedantic pedantic here, though.

I guess the proper fix would be to do our own parser; and to add some of the URL-specific magic 
adblock+ has while I am at it... 

CCBUG: 249394

 M  +1 -1      khtml_filter.cpp  


--- trunk/KDE/kdelibs/khtml/khtml_filter.cpp #1170034:1170035
@@ -84,7 +84,7 @@
             filter = filter.mid(first, last - first + 1);
 
         // Now, do we still have any wildcard stuff left?
-        if (filter.contains("*") || filter.contains("?"))
+        if (filter.contains("*"))
         {
 //             qDebug() << "W:" << filter;
             // check if we can use RK first (and then check full RE for the rest) for better performance
[prev in list] [next in list] [prev in thread] [next in thread]