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

Malloc in bytes, not characters, and don't copy freed memory

Browse source 
This was teamwork of Brian, Enrico and me.
This commit is contained in:
Christian Dywan 2008-11-18 22:00:38 +01:00
parent 56d26b02e5
commit 166a7e48e0
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/midori-locationaction.c
View file

@ -423,12 +423,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
{ {
temp = g_utf8_strdown (uri, -1); temp = g_utf8_strdown (uri, -1);
start = strstr (temp, key); start = strstr (temp, key);
g_free (temp);
if (start) if (start)
{ {
len = g_utf8_strlen (key, -1); skey = g_malloc0 (strlen (key) + 1);
skey = g_malloc0 (len); g_utf8_strncpy (skey, uri + (start - temp), g_utf8_strlen (key, -1));
g_utf8_strncpy (skey, uri + (start - temp), len);
parts = g_strsplit (uri, skey, 2); parts = g_strsplit (uri, skey, 2);
if (parts && parts[0] && parts[1]) if (parts && parts[0] && parts[1])
desc_uri = g_markup_printf_escaped ("%s<b>%s</b>%s", desc_uri = g_markup_printf_escaped ("%s<b>%s</b>%s",
@ -436,6 +434,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
g_strfreev (parts); g_strfreev (parts);
g_free (skey); g_free (skey);
} }
g_free (temp);
} }
if (uri && !desc_uri) if (uri && !desc_uri)
desc_uri = g_markup_escape_text (uri, -1); desc_uri = g_markup_escape_text (uri, -1);
@ -443,12 +442,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
{ {
temp = g_utf8_strdown (title, -1); temp = g_utf8_strdown (title, -1);
start = strstr (temp, key); start = strstr (temp, key);
g_free (temp);
if (start) if (start)
{ {
len = g_utf8_strlen (key, -1); skey = g_malloc0 (strlen (key) + 1);
skey = g_malloc0 (len); g_utf8_strncpy (skey, title + (start - temp), g_utf8_strlen (key, -1));
g_utf8_strncpy (skey, title + (start - temp), len);
parts = g_strsplit (title, skey, 2); parts = g_strsplit (title, skey, 2);
if (parts && parts[0] && parts[1]) if (parts && parts[0] && parts[1])
desc_title = g_markup_printf_escaped ("%s<b>%s</b>%s", desc_title = g_markup_printf_escaped ("%s<b>%s</b>%s",
@ -456,6 +453,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
g_strfreev (parts); g_strfreev (parts);
g_free (skey); g_free (skey);
} }
g_free (temp);
} }
if (title && !desc_title) if (title && !desc_title)
desc_title = g_markup_escape_text (title, -1); desc_title = g_markup_escape_text (title, -1);