luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-12 18:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3554-resource-uri-malformed-glib-2-76' into 'glib-2-76'

Browse Source 
Backport !3554 “gresourcefile: Fix crash if called with a badly escaped URI” to glib-2-76

See merge request GNOME/glib!3556
This commit is contained in:
Michael Catanzaro 2023-08-29 17:24:03 +00:00
commit 32b36328e8
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gresourcefile.c
View File

@ -238,6 +238,7 @@ g_resource_file_new_for_path (const char *path)
return G_FILE (resource); return G_FILE (resource);
} }
/* Will return %NULL if @uri is malformed */
GFile * GFile *
_g_resource_file_new (const char *uri) _g_resource_file_new (const char *uri)
{ {
@ -245,6 +246,9 @@ _g_resource_file_new (const char *uri)
char *path; char *path;
path = g_uri_unescape_string (uri + strlen ("resource:"), NULL); path = g_uri_unescape_string (uri + strlen ("resource:"), NULL);
if (path == NULL)
return NULL;
resource = g_resource_file_new_for_path (path); resource = g_resource_file_new_for_path (path);
g_free (path); g_free (path);

28
gio/tests/vfs.c
View File

@ -108,18 +108,39 @@ test_local (void)
gchar **schemes; gchar **schemes;
vfs = g_vfs_get_local (); vfs = g_vfs_get_local ();
g_assert (g_vfs_is_active (vfs)); g_assert_true (g_vfs_is_active (vfs));
file = g_vfs_get_file_for_uri (vfs, "not a good uri"); file = g_vfs_get_file_for_uri (vfs, "not a good uri");
g_assert (G_IS_FILE (file)); g_assert_true (G_IS_FILE (file));
g_object_unref (file); g_object_unref (file);
schemes = (gchar **)g_vfs_get_supported_uri_schemes (vfs); schemes = (gchar **)g_vfs_get_supported_uri_schemes (vfs);
g_assert (g_strv_length (schemes) > 0); g_assert_cmpuint (g_strv_length (schemes), >, 0);
g_assert_cmpstr (schemes[0], ==, "file"); g_assert_cmpstr (schemes[0], ==, "file");
} }
static void
test_resource_malformed_escaping (void)
{
GVfs *vfs;
GFile *file;
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3090");
g_test_summary ("Test that g_vfs_get_file_for_uri() returns an invalid file for an invalid URI");
vfs = g_vfs_get_local ();
g_assert_true (g_vfs_is_active (vfs));
file = g_vfs_get_file_for_uri (vfs, "resource:///%not-valid-escaping/gtk.css");
g_assert_true (G_IS_FILE (file));
/* This only returns %NULL if the file was constructed with an invalid URI: */
g_assert_null (g_file_get_uri_scheme (file));
g_object_unref (file);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -127,6 +148,7 @@ main (int argc, char *argv[])
g_test_add_func ("/gvfs/local", test_local); g_test_add_func ("/gvfs/local", test_local);
g_test_add_func ("/gvfs/register-scheme", test_register_scheme); g_test_add_func ("/gvfs/register-scheme", test_register_scheme);
g_test_add_func ("/gvfs/resource/malformed-escaping", test_resource_malformed_escaping);
return g_test_run (); return g_test_run ();
} }