luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-31 22:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_get_host_name: ensure hostname has UTF8 encoding on Windows

Browse Source 
Ensures that the hostname returned by g_get_host_name is always UTF8 encoded.
Previously, on Windows, the returned string would be encoded in the
current codepage, if it contained non-ASCII characters.

The unit test for g_get_host_name was updated with a check to ensure
that the hostname is indeed at UTF-8 string.

https://bugzilla.gnome.org/show_bug.cgi?id=789755
This commit is contained in:
Tom Schoonjans
2017-11-01 09:52:29 +00:00
committed by Philip Withnall
parent 41112ef00d
commit d011223085
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gutils.c
View File

@@ -970,6 +970,8 @@ g_get_tmp_dir (void)
* name can be determined, a default fixed string "localhost" is * name can be determined, a default fixed string "localhost" is
* returned. * returned.
* *
* The encoding of the returned string is UTF-8.
*
* Returns: the host name of the machine. * Returns: the host name of the machine.
* *
* Since: 2.8 * Since: 2.8
@@ -982,16 +984,23 @@ g_get_host_name (void)
if (g_once_init_enter (&hostname)) if (g_once_init_enter (&hostname))
{ {
gboolean failed; gboolean failed;
gchar tmp[100]; gchar *utmp;
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
failed = (gethostname (tmp, sizeof (tmp)) == -1); gchar *tmp = g_malloc (sizeof (gchar) * 100);
failed = (gethostname (tmp, sizeof (gchar) * 100) == -1);
utmp = tmp;
#else #else
DWORD size = sizeof (tmp); wchar_t tmp[MAX_COMPUTERNAME_LENGTH + 1];
failed = (!GetComputerName (tmp, &size)); DWORD size = sizeof (tmp) / sizeof (tmp[0]);
failed = (!GetComputerNameW (tmp, &size));
if (!failed)
utmp = g_utf16_to_utf8 (tmp, size, NULL, NULL, NULL);
if (utmp == NULL)
failed = TRUE;
#endif #endif
g_once_init_leave (&hostname, g_strdup (failed ? "localhost" : tmp)); g_once_init_leave (&hostname, failed ? g_strdup ("localhost") : utmp);
} }
return hostname; return hostname;

1
glib/tests/utils.c
View File

@@ -391,6 +391,7 @@ test_hostname (void)
name = g_get_host_name (); name = g_get_host_name ();
g_assert (name != NULL); g_assert (name != NULL);
g_assert_true (g_utf8_validate (name, -1, NULL));
} }
#ifdef G_OS_UNIX #ifdef G_OS_UNIX