luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

ghostutils: Fix a crash and add some tests

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=608743
This commit is contained in:
Dan Winship 2010-02-01 18:11:43 -05:00
parent 3443f47ddf
commit 27a080537e
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/ghostutils.c
View File

@ -344,6 +344,9 @@ nameprep (const gchar *hostname,
g_free (tmp); g_free (tmp);
tmp = name; tmp = name;
if (!name)
return NULL;
/* KC normalization may have created more capital letters (eg, /* KC normalization may have created more capital letters (eg,
* angstrom -> capital A with ring). So we have to lowercasify a * angstrom -> capital A with ring). So we have to lowercasify a
* second time. (This is more-or-less how the nameprep algorithm * second time. (This is more-or-less how the nameprep algorithm
@ -398,8 +401,11 @@ g_hostname_to_ascii (const gchar *hostname)
gssize llen, oldlen; gssize llen, oldlen;
gboolean unicode; gboolean unicode;
out = g_string_new (NULL);
label = name = nameprep (hostname, -1); label = name = nameprep (hostname, -1);
if (!name)
return NULL;
out = g_string_new (NULL);
do do
{ {
@ -591,6 +597,11 @@ g_hostname_to_unicode (const gchar *hostname)
{ {
gchar *canonicalized = nameprep (hostname, llen); gchar *canonicalized = nameprep (hostname, llen);
if (!canonicalized)
{
g_string_free (out, TRUE);
return NULL;
}
g_string_append (out, canonicalized); g_string_append (out, canonicalized);
g_free (canonicalized); g_free (canonicalized);
} }

19
glib/tests/hostutils.c
View File

@ -48,6 +48,13 @@ static const struct {
}; };
static const gint num_idn_test_domains = G_N_ELEMENTS (idn_test_domains); static const gint num_idn_test_domains = G_N_ELEMENTS (idn_test_domains);
static const gchar *bad_names[] = {
"disallowed\xef\xbf\xbd" "character",
"non-utf\x88",
"xn--mixed-\xc3\xbcp"
};
static const gint num_bad_names = G_N_ELEMENTS (bad_names);
static void static void
test_to_ascii (void) test_to_ascii (void)
{ {
@ -65,6 +72,12 @@ test_to_ascii (void)
g_assert_cmpstr (idn_test_domains[i].ascii_name, ==, ascii); g_assert_cmpstr (idn_test_domains[i].ascii_name, ==, ascii);
g_free (ascii); g_free (ascii);
} }
for (i = 0; i < num_bad_names; i++)
{
ascii = g_hostname_to_ascii (bad_names[i]);
g_assert_cmpstr (ascii, ==, NULL);
}
} }
static void static void
@ -84,6 +97,12 @@ test_to_unicode (void)
g_assert_cmpstr (idn_test_domains[i].unicode_name, ==, unicode); g_assert_cmpstr (idn_test_domains[i].unicode_name, ==, unicode);
g_free (unicode); g_free (unicode);
} }
for (i = 0; i < num_bad_names; i++)
{
unicode = g_hostname_to_unicode (bad_names[i]);
g_assert_cmpstr (unicode, ==, NULL);
}
} }
static const struct { static const struct {