luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-24 02:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Ensure message matching always succeeds against path_namespace='/'

Browse Source 
This copies the fix from upstream D-Bus bug
https://bugs.freedesktop.org/show_bug.cgi?id=70799 to the GDBusDaemon
implementation, ensuring that matching against path_namespace='/' succeeds
for all keys (i.e. it’s a no-op).

https://bugzilla.gnome.org/show_bug.cgi?id=710726
This commit is contained in:
Philip Withnall
2013-10-23 15:45:15 +01:00
parent ffb9bb1f79
commit 6e18d05a0d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdbusdaemon.c
View File

@@ -596,9 +596,18 @@ match_matches (GDBusDaemon *daemon,
break;
case CHECK_TYPE_PATH_PREFIX:
len = strlen (element->value);
if (!(g_str_has_prefix (value, element->value) &&
(value[len] == 0 || value[len] == '/')))
/* Make sure to handle the case of element->value == '/'. */
if (len == 1)
break;
/* Fail if there's no prefix match, or if the prefix match doesn't
* finish at the end of or at a separator in the @value. */
if (!g_str_has_prefix (value, element->value))
return FALSE;
if (value[len] != 0 && value[len] != '/')
return FALSE;
break;
case CHECK_TYPE_PATH_RELATED:
len = strlen (element->value);