Merge lp:~tuxator/midori/adblock-regexp into lp:midori

[Paweł Forysiuk]

Escape square brackets in adblock_fixup_regexp

[Cris Dywan (kalikiana)]

Looks good!

review: Approve

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-03-03 21:02:11 +0000
+++ extensions/adblock.c	2013-06-20 20:56:24 +0000
@@ -1156,6 +1156,12 @@
         case '^':
         case '+':
             break;
+        case '[':
+            g_string_append (str, "\\[");
+            break;
+        case ']':
+            g_string_append (str, "\\]");
+            break;
         default:
             g_string_append_printf (str,"%c", *src);
             break;
@@ -1781,6 +1787,7 @@
 
     g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "..*foo/bar");
     g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
+    g_assert_cmpstr (adblock_parse_line ("bag?r[]=*cpa"), ==, "bag\\?r\\[\\]=.*cpa");
     adblock_destroy_db ();
 }