Midori Web Browser

Merge lp://qastaging/~gue5t/midori/adblock-crashes into lp://qastaging/midori

adblock-crashes
Merge into trunk

Proposed by gue5t gue5t on 2016-01-23

Status:

Merged

Approved by:

Paweł Forysiuk on 2016-02-01

Approved revision:

7087

Merged at revision:

7098

Proposed branch:

lp://qastaging/~gue5t/midori/adblock-crashes

Merge into:

lp://qastaging/midori

Diff against target:

63 lines (+20/-17)

2 files modified

extensions/adblock/extension.vala (+1/-1)
extensions/adblock/updater.vala (+19/-16)

To merge this branch:

bzr merge lp://qastaging/~gue5t/midori/adblock-crashes

Related bugs:

Bug #1530669: change http:// to ./ will cause SEGFAULT	Undecided	Fix Committed
Bug #1531585: Midori segfaults on adding IsraelList to Adblock	High	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paweł Forysiuk		2016-01-23	Approve on 2016-02-01
Review via email: mp+283732@code.qastaging.launchpad.net

Commit message

Fix crashes caused by out-of-bounds indexing in adblock

Description of the change

Pretty self-explanatory. In updater.vala, we rearrange control flow a little, so give that a bit of review. But it looks right to me and fixes the crashes without regressing any behavior.

The fixed israellist crash can be tested with the adblock subscription list https://raw.githubusercontent.com/ABPIsrael/EasyListHebrew/aebe4846c689c473e8dde278393f1d99b653d97c/EasyListHebrew.txt which is the last commit before the date format was fixed upstream.