debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid memory allocated sig in adblock_is_matched_by_key

Browse source
This commit is contained in:
Alexander Butenko 2011-11-28 20:58:57 +01:00 committed by Christian Dywan
parent f8b6792756
commit 249619a631
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extensions/adblock.c
View file

@ -648,6 +648,7 @@ adblock_is_matched_by_key (const gchar* req_uri,
GList* regex_bl = NULL; GList* regex_bl = NULL;
GString* guri; GString* guri;
gboolean ret = FALSE; gboolean ret = FALSE;
gchar sig[SIGNATURE_SIZE + 1];
/* Signatures are made on pattern, so we need to convert url to a pattern as well */ /* Signatures are made on pattern, so we need to convert url to a pattern as well */
guri = adblock_fixup_regexp ("", (gchar*)req_uri); guri = adblock_fixup_regexp ("", (gchar*)req_uri);
@ -656,21 +657,17 @@ adblock_is_matched_by_key (const gchar* req_uri,
for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--)
{ {
gchar* sig = g_strndup (uri + pos, SIGNATURE_SIZE); GRegex* regex;
GRegex* regex = g_hash_table_lookup (keys, sig); strncpy (sig, uri + pos, SIGNATURE_SIZE);
regex = g_hash_table_lookup (keys, sig);
/* Dont check if regex is already blacklisted */ /* Dont check if regex is already blacklisted */
if (!regex || g_list_find (regex_bl, regex)) if (!regex || g_list_find (regex_bl, regex))
{
g_free (sig);
continue; continue;
}
ret = adblock_check_rule (regex, sig, req_uri, page_uri); ret = adblock_check_rule (regex, sig, req_uri, page_uri);
g_free (sig);
if (!ret) if (!ret)
regex_bl = g_list_prepend (regex_bl, regex);
else
break; break;
regex_bl = g_list_prepend (regex_bl, regex);
} }
g_string_free (guri, TRUE); g_string_free (guri, TRUE);
g_list_free (regex_bl); g_list_free (regex_bl);