luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-03 22:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1819-file-for-uri-null' into 'master'

Browse Source 
Resolve "Invalid characters in Open Location dialog crashes GIMP"

Closes #1819

See merge request GNOME/glib!966
This commit is contained in:
Philip Withnall 2019-08-27 05:41:24 +00:00
commit 1c41e348ae
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gvfs.c
View File

@ -236,7 +236,7 @@ g_vfs_get_file_for_uri (GVfs *vfs,
const char *uri) const char *uri)
{ {
GVfsClass *class; GVfsClass *class;
GFile *ret; GFile *ret = NULL;
g_return_val_if_fail (G_IS_VFS (vfs), NULL); g_return_val_if_fail (G_IS_VFS (vfs), NULL);
g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (uri != NULL, NULL);
@ -244,10 +244,12 @@ g_vfs_get_file_for_uri (GVfs *vfs,
class = G_VFS_GET_CLASS (vfs); class = G_VFS_GET_CLASS (vfs);
ret = get_file_for_uri_internal (vfs, uri); ret = get_file_for_uri_internal (vfs, uri);
if (ret) if (!ret)
return ret; ret = (* class->get_file_for_uri) (vfs, uri);
return (* class->get_file_for_uri) (vfs, uri); g_assert (ret != NULL);
return g_steal_pointer (&ret);
} }
/** /**

2
gio/win32/gwinhttpfile.c
View File

@ -80,7 +80,7 @@ g_winhttp_file_init (GWinHttpFile *winhttp)
* @vfs: GWinHttpVfs to use * @vfs: GWinHttpVfs to use
* @uri: URI of the GWinHttpFile to create. * @uri: URI of the GWinHttpFile to create.
* *
* Returns: new winhttp #GFile. * Returns: (nullable): new winhttp #GFile, or %NULL if there was an error constructing it.
*/ */
GFile * GFile *
_g_winhttp_file_new (GWinHttpVfs *vfs, _g_winhttp_file_new (GWinHttpVfs *vfs,

18
gio/win32/gwinhttpvfs.c
View File

@ -165,15 +165,25 @@ g_winhttp_vfs_get_file_for_uri (GVfs *vfs,
{ {
GWinHttpVfs *winhttp_vfs = G_WINHTTP_VFS (vfs); GWinHttpVfs *winhttp_vfs = G_WINHTTP_VFS (vfs);
int i; int i;
GFile *ret = NULL;
/* If it matches one of "our" schemes, handle it */ /* If it matches one of "our" schemes, handle it */
for (i = 0; i < G_N_ELEMENTS (winhttp_uri_schemes); i++) for (i = 0; i < G_N_ELEMENTS (winhttp_uri_schemes); i++)
if (g_ascii_strncasecmp (uri, winhttp_uri_schemes[i], strlen (winhttp_uri_schemes[i])) == 0 && {
uri[strlen (winhttp_uri_schemes[i])] == ':') if (g_ascii_strncasecmp (uri, winhttp_uri_schemes[i], strlen (winhttp_uri_schemes[i])) == 0 &&
return _g_winhttp_file_new (winhttp_vfs, uri); uri[strlen (winhttp_uri_schemes[i])] == ':')
{
ret = _g_winhttp_file_new (winhttp_vfs, uri);
}
}
/* For other URIs fallback to the wrapped GVfs */ /* For other URIs fallback to the wrapped GVfs */
return g_vfs_get_file_for_uri (winhttp_vfs->wrapped_vfs, uri); if (ret == NULL)
ret = g_vfs_get_file_for_uri (winhttp_vfs->wrapped_vfs, uri);
g_assert (ret != NULL);
return g_steal_pointer (&ret);
} }
static const gchar * const * static const gchar * const *