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

Catch failure to unescape Uris and don't escape ' ' or '+'

Browse source
This commit is contained in:
Christian Dywan 2009-11-20 20:33:51 +01:00
parent 34e02640cf
commit 7bfd4e147d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
midori/sokoke.c
View file

@ -458,11 +458,17 @@ sokoke_format_uri_for_display (const gchar* uri)
{ {
if (uri && g_str_has_prefix (uri, "http://")) if (uri && g_str_has_prefix (uri, "http://"))
{ {
gchar* unescaped = g_uri_unescape_string (uri, NULL); gchar* unescaped = g_uri_unescape_string (uri, " +");
#ifdef HAVE_LIBSOUP_2_27_90 #ifdef HAVE_LIBSOUP_2_27_90
gchar* path; gchar* path;
gchar* hostname = sokoke_hostname_from_uri (unescaped, &path); gchar* hostname;
gchar* decoded = g_hostname_to_unicode (hostname); gchar* decoded;
if (!unescaped)
return g_strdup (uri);
hostname = sokoke_hostname_from_uri (unescaped, &path);
decoded = g_hostname_to_unicode (hostname);
if (decoded) if (decoded)
{ {
@ -476,6 +482,10 @@ sokoke_format_uri_for_display (const gchar* uri)
return unescaped; return unescaped;
#elif HAVE_LIBIDN #elif HAVE_LIBIDN
gchar* decoded; gchar* decoded;
if (!unescaped)
return g_strdup (uri);
if (!idna_to_unicode_8z8z (unescaped, &decoded, 0) == IDNA_SUCCESS) if (!idna_to_unicode_8z8z (unescaped, &decoded, 0) == IDNA_SUCCESS)
return unescaped; return unescaped;
g_free (unescaped); g_free (unescaped);