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

[gue5t gue5t]

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

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.

[Paweł Forysiuk (tuxator)]

I would suggest adding this unusual date string to our tests examples.

 Otherwise the change looks sensible.

[gue5t gue5t (gue5t)]

It looks like our test infrastructure for extensions is rather badly broken. I'm trying to fix that at <https://code.launchpad.net/%7Egue5t/midori/adblock-crashes/+merge/283732>.

[gue5t gue5t (gue5t)]

Oops, wrong link--it should be <https://code.launchpad.net/~gue5t/midori/extension-tests/+merge/283894>.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2016-01-10 18:53:56 +0000
+++ extensions/adblock/extension.vala	2016-01-23 21:38:31 +0000
@@ -263,7 +263,7 @@
             string[]? domains = null;
             string domain = Midori.URI.parse_hostname (uri, null);
             string[] subdomains = domain.split (".");
-            if (subdomains == null)
+            if (subdomains == null || subdomains.length == 0)
                 return null;
             int cnt = subdomains.length - 1;
             var subdomain = new StringBuilder (subdomains[cnt]);

=== modified file 'extensions/adblock/updater.vala'
--- extensions/adblock/updater.vala	2014-07-17 04:35:03 +0000
+++ extensions/adblock/updater.vala	2016-01-23 21:38:31 +0000
@@ -100,27 +100,30 @@
                         y = int.parse(date_parts[0]);
                         d = int.parse(date_parts[2]);
                     }
+                    last_updated = new DateTime.local (y, m, d, h, min, 0.0);
                 } else { /* Date in a form of: 20 Mar 2012 12:34 */
                     string[] parts = last_mod_meta.split (" ", 4);
-                    /* contains time part ? */
-                    if (parts[3] != null && parts[3].contains (":")) {
-                        string[] time_parts = parts[3].split (":", 2);
-                        h = int.parse(time_parts[0]);
-                        min = int.parse(time_parts[1]);
-                    }
+                    if (parts.length >= 3) {
+                        /* contains time part ? */
+                        if (parts.length >= 4 && parts[3].contains (":")) {
+                            string[] time_parts = parts[3].split (":", 2);
+                            h = int.parse(time_parts[0]);
+                            min = int.parse(time_parts[1]);
+                        }
 
-                    m = get_month_from_string (parts[1]);
-                    if (parts[2].length == 4) {
-                        y = int.parse(parts[2]);
-                        d = int.parse(parts[0]);
-                    } else {
-                        y = int.parse(parts[0]);
-                        d = int.parse(parts[2]);
+                        m = get_month_from_string (parts[1]);
+                        if (parts[2].length == 4) {
+                            y = int.parse(parts[2]);
+                            d = int.parse(parts[0]);
+                        } else {
+                            y = int.parse(parts[0]);
+                            d = int.parse(parts[2]);
+                        }
+                        last_updated = new DateTime.local (y, m, d, h, min, 0.0);
                     }
                 }
-
-                last_updated = new DateTime.local (y, m, d, h, min, 0.0);
-            } else {
+            }
+            if (last_updated == null) {
                 /* FIXME: use file modification date if there's no update header
                 try {
                     string modified = FileAttribute.TIME_MODIFIED;