mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
Merge branch 'winhttp-handle-null-prgname' into 'master'
gwinhttpvfs: Handle g_get_prgname() returning NULL See merge request GNOME/glib!1152
This commit is contained in:
commit
a350fa50a5
@ -121,12 +121,13 @@ static void
|
||||
g_winhttp_vfs_init (GWinHttpVfs *vfs)
|
||||
{
|
||||
wchar_t *wagent;
|
||||
const gchar *prgname = g_get_prgname ();
|
||||
|
||||
vfs->wrapped_vfs = g_vfs_get_local ();
|
||||
|
||||
wagent = g_utf8_to_utf16 (g_get_prgname (), -1, NULL, NULL, NULL);
|
||||
|
||||
if (!wagent)
|
||||
if (prgname)
|
||||
wagent = g_utf8_to_utf16 (prgname, -1, NULL, NULL, NULL);
|
||||
else
|
||||
wagent = g_utf8_to_utf16 ("GWinHttpVfs", -1, NULL, NULL, NULL);
|
||||
|
||||
vfs->session = (G_WINHTTP_VFS_GET_CLASS (vfs)->funcs->pWinHttpOpen)
|
||||
|
Loading…
Reference in New Issue
Block a user