Midori Web Browser

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

  1. adblock-regexp
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6223
Merged at revision: 6223
Proposed branch: lp:~tuxator/midori/adblock-regexp
Merge into: lp:midori
Diff against target: 23 lines (+7/-0)
1 file modified
extensions/adblock.c (+7/-0)
To merge this branch: bzr merge lp:~tuxator/midori/adblock-regexp
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+170700@code.launchpad.net

Commit message

Escape square brackets in adblock_fixup_regexp

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/adblock.c'
2--- extensions/adblock.c 2013-03-03 21:02:11 +0000
3+++ extensions/adblock.c 2013-06-20 20:56:24 +0000
4@@ -1156,6 +1156,12 @@
5 case '^':
6 case '+':
7 break;
8+ case '[':
9+ g_string_append (str, "\\[");
10+ break;
11+ case ']':
12+ g_string_append (str, "\\]");
13+ break;
14 default:
15 g_string_append_printf (str,"%c", *src);
16 break;
17@@ -1781,6 +1787,7 @@
18
19 g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "..*foo/bar");
20 g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
21+ g_assert_cmpstr (adblock_parse_line ("bag?r[]=*cpa"), ==, "bag\\?r\\[\\]=.*cpa");
22 adblock_destroy_db ();
23 }
24

Subscribers

People subscribed via source and target branches

to all changes: