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

GDesktopAppInfo: Ensure that URI scheme is a valid argument

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2022-06-14 16:30:42 +02:00
parent c87602451c
commit 6fef60b65c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdesktopappinfo.c
View File

@ -4626,6 +4626,8 @@ g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
GAppInfo *app_info; GAppInfo *app_info;
char *content_type, *scheme_down; char *content_type, *scheme_down;
g_return_val_if_fail (uri_scheme != NULL && *uri_scheme != '\0', NULL);
scheme_down = g_ascii_strdown (uri_scheme, -1); scheme_down = g_ascii_strdown (uri_scheme, -1);
content_type = g_strdup_printf ("x-scheme-handler/%s", scheme_down); content_type = g_strdup_printf ("x-scheme-handler/%s", scheme_down);
g_free (scheme_down); g_free (scheme_down);

21
gio/tests/desktop-app-info.c
View File

@ -119,6 +119,23 @@ test_default (void)
g_assert_cmpstr (g_app_info_get_id (info), ==, g_app_info_get_id (info2)); g_assert_cmpstr (g_app_info_get_id (info), ==, g_app_info_get_id (info2));
g_object_unref (info); g_object_unref (info);
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
"*assertion*uri_scheme*failed*");
g_assert_null (g_app_info_get_default_for_uri_scheme (NULL));
g_test_assert_expected_messages ();
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
"*assertion*uri_scheme*failed*");
g_assert_null (g_app_info_get_default_for_uri_scheme (""));
g_test_assert_expected_messages ();
g_app_info_set_as_default_for_type (info3, "x-scheme-handler/glib", &error);
g_assert_no_error (error);
info = g_app_info_get_default_for_uri_scheme ("glib");
g_assert_nonnull (info);
g_assert_true (g_app_info_equal (info, info3));
g_object_unref (info);
/* now try adding something, but not setting as default */ /* now try adding something, but not setting as default */
g_app_info_add_supports_type (info3, "application/x-test", &error); g_app_info_add_supports_type (info3, "application/x-test", &error);
g_assert_no_error (error); g_assert_no_error (error);
@ -141,10 +158,14 @@ test_default (void)
/* now clean it all up */ /* now clean it all up */
g_app_info_reset_type_associations ("application/x-test"); g_app_info_reset_type_associations ("application/x-test");
g_app_info_reset_type_associations ("x-scheme-handler/glib");
list = g_app_info_get_all_for_type ("application/x-test"); list = g_app_info_get_all_for_type ("application/x-test");
g_assert_null (list); g_assert_null (list);
list = g_app_info_get_all_for_type ("x-scheme-handler/glib");
g_assert_null (list);
g_app_info_delete (info1); g_app_info_delete (info1);
g_app_info_delete (info2); g_app_info_delete (info2);
g_app_info_delete (info3); g_app_info_delete (info3);