[Xfce4-commits] <midori:master> adblock_compile_regexp free data after checking it

[Christian Dywan]

Updating branch refs/heads/master
         to 760270832a9d5ada8e942c9a61ff4738b27f5ab4 (commit)
       from ffd3026baf5aecb27d51399f8896a693279783f6 (commit)

commit 760270832a9d5ada8e942c9a61ff4738b27f5ab4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Nov 28 23:31:17 2011 +0100

    adblock_compile_regexp free data after checking it

 extensions/adblock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index d41bd85..93e92bb 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -1152,11 +1152,11 @@ adblock_add_url_pattern (gchar* prefix,
     if (g_regex_match_simple ("subdocument", opts,
                               G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
     {
-        g_strfreev (data);
         if (data[1] && data[2])
             g_free (patt);
         if (data[1])
             g_free (opts);
+        g_strfreev (data);
         return NULL;
     }
 
@@ -1165,11 +1165,11 @@ adblock_add_url_pattern (gchar* prefix,
     adblock_debug ("got: %s opts %s", format_patt->str, opts);
     should_free = adblock_compile_regexp (format_patt, opts);
 
-    g_strfreev (data);
     if (data[1] && data[2])
         g_free (patt);
     if (data[1])
         g_free (opts);
+    g_strfreev (data);
 
     return g_string_free (format_patt, should_free);
 }