luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 00:16:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'winhttp-handle-null-prgname' into 'master'

Browse Source 
gwinhttpvfs: Handle g_get_prgname() returning NULL

See merge request GNOME/glib!1152
This commit is contained in:
Philip Withnall 2019-10-07 09:04:06 +00:00
commit a350fa50a5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/win32/gwinhttpvfs.c
View File

@ -121,12 +121,13 @@ static void
g_winhttp_vfs_init (GWinHttpVfs *vfs) g_winhttp_vfs_init (GWinHttpVfs *vfs)
{ {
wchar_t *wagent; wchar_t *wagent;
const gchar *prgname = g_get_prgname ();
vfs->wrapped_vfs = g_vfs_get_local (); vfs->wrapped_vfs = g_vfs_get_local ();
wagent = g_utf8_to_utf16 (g_get_prgname (), -1, NULL, NULL, NULL); if (prgname)
wagent = g_utf8_to_utf16 (prgname, -1, NULL, NULL, NULL);
if (!wagent) else
wagent = g_utf8_to_utf16 ("GWinHttpVfs", -1, NULL, NULL, NULL); wagent = g_utf8_to_utf16 ("GWinHttpVfs", -1, NULL, NULL, NULL);
vfs->session = (G_WINHTTP_VFS_GET_CLASS (vfs)->funcs->pWinHttpOpen) vfs->session = (G_WINHTTP_VFS_GET_CLASS (vfs)->funcs->pWinHttpOpen)