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

Validate uri and title in completion in case of invalid UTF-8

Browse source
This commit is contained in:
Christian Dywan 2009-12-12 17:40:30 +01:00
parent d1410ef73d
commit fb5d74d53f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
midori/midori-locationaction.c
View file

@ -664,7 +664,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
: g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); : g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1);
len = 0; len = 0;
if (G_LIKELY (uri)) /* g_uri_unescape_segment () sometimes produces garbage */
if (G_UNLIKELY (uri && !g_utf8_validate (uri, -1, (const gchar **)&temp)))
temp[0]='\0';
else if (G_LIKELY (uri))
{ {
temp = g_utf8_strdown (uri, -1); temp = g_utf8_strdown (uri, -1);
if (key && *key && (start = strstr (temp, key))) if (key && *key && (start = strstr (temp, key)))
@ -685,7 +688,11 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
} }
if (uri && !desc_uri) if (uri && !desc_uri)
desc_uri = g_markup_escape_text (uri, -1); desc_uri = g_markup_escape_text (uri, -1);
if (G_LIKELY (title))
/* g_uri_unescape_segment () sometimes produces garbage */
if (G_UNLIKELY (title && !g_utf8_validate (title, -1, (const gchar **)&temp)))
temp[0]='\0';
else if (G_LIKELY (title))
{ {
temp = g_utf8_strdown (title, -1); temp = g_utf8_strdown (title, -1);
if (key && *key && (start = strstr (temp, key))) if (key && *key && (start = strstr (temp, key)))