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

NULL check the key before rendering suggestions

Browse source
This commit is contained in:
Alexander Butenko 2010-02-04 02:40:59 +01:00 committed by Christian Dywan
parent 94aebbf1fe
commit c273d6c73a
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
midori/midori-locationaction.c
View file

@ -997,6 +997,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
gchar* desc_uri; gchar* desc_uri;
gchar* desc_title; gchar* desc_title;
GtkWidget* entry; GtkWidget* entry;
const gchar* str;
gchar* key; gchar* key;
gchar* start; gchar* start;
gchar* skey; gchar* skey;
@ -1009,26 +1010,27 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
desc = desc_uri = desc_title = key = NULL; desc = desc_uri = desc_title = key = NULL;
key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); str = gtk_entry_get_text (GTK_ENTRY (entry));
len = 0; if (!str)
return;
key = g_utf8_strdown (str, -1);
len = strlen (key);
if (G_LIKELY (uri)) if (G_LIKELY (uri))
{ {
temp = g_utf8_strdown (uri, -1); temp = g_utf8_strdown (uri, -1);
if ((start = strstr (temp, key)) && (start - temp)) if ((start = strstr (temp, key)) && (start - temp))
{ {
len = strlen (key);
skey = g_strndup (uri + (start - temp), len); skey = g_strndup (uri + (start - temp), len);
parts = g_strsplit (uri, skey, 2); parts = g_strsplit (uri, skey, 2);
if (parts[0] && parts[1]) if (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",
parts[0], skey, parts[1]); parts[0], skey, parts[1]);
else
desc_uri = g_markup_escape_text (uri, -1);
g_strfreev (parts); g_strfreev (parts);
g_free (skey); g_free (skey);
} }
else if (!desc_uri)
desc_uri = g_markup_escape_text (uri, -1); desc_uri = g_markup_escape_text (uri, -1);
g_free (temp); g_free (temp);
} }
@ -1038,19 +1040,15 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
temp = g_utf8_strdown (title, -1); temp = g_utf8_strdown (title, -1);
if ((start = strstr (temp, key)) && (start - temp)) if ((start = strstr (temp, key)) && (start - temp))
{ {
if (!len)
len = strlen (key);
skey = g_strndup (title + (start - temp), len); skey = g_strndup (title + (start - temp), len);
parts = g_strsplit (title, skey, 2); parts = g_strsplit (title, skey, 2);
if (parts && parts[0] && parts[1]) if (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",
parts[0], skey, parts[1]); parts[0], skey, parts[1]);
else
desc_title = g_markup_escape_text (title, -1);
g_strfreev (parts); g_strfreev (parts);
g_free (skey); g_free (skey);
} }
else if (!desc_title)
desc_title = g_markup_escape_text (title, -1); desc_title = g_markup_escape_text (title, -1);
g_free (temp); g_free (temp);
} }