Attachment 88037 Details for Bug 70799 – [1.6, master] path_namespace='/' should match everything

[patch] [1.6, master] path_namespace='/' should match everything

0001-path_namespace-should-match-everything.patch (text/plain), 3.23 KB, created by Simon McVittie on 2013-10-23 14:19:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-23 14:19:58 UTC

Size: 3.23 KB

patch

obsolete

>From 7c511ace0922a10f38872da2f186d16e700a42f2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 23 Oct 2013 15:19:13 +0100
>Subject: [PATCH] path_namespace='/' should match everything
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70799
>---
> bus/signals.c | 30 +++++++++++++++++++++++++++++-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
>diff --git a/bus/signals.c b/bus/signals.c
>index 28506d3..a198c6e 100644
>--- a/bus/signals.c
>+++ b/bus/signals.c
>@@ -1836,8 +1836,11 @@ match_rule_matches (BusMatchRule    *rule,
>        * namespace, rather than just starting with that string,
>        * by checking that the matched prefix is followed by a '/'
>        * or the end of the path.
>+       *
>+       * Special case: the only valid path of length 1, "/",
>+       * matches everything.
>        */
>-      if (path[len] != '\0' && path[len] != '/')
>+      if (len > 1 && path[len] != '\0' && path[len] != '/')
>         return FALSE;
>     }
> 
>@@ -2719,6 +2722,7 @@ test_path_matching (void)
> 
> static const char*
> path_namespace_should_match_message_1[] = {
>+  "type='signal',path_namespace='/'",
>   "type='signal',path_namespace='/foo'",
>   "type='signal',path_namespace='/foo/TheObjectManager'",
>   NULL
>@@ -2733,6 +2737,7 @@ path_namespace_should_not_match_message_1[] = {
> 
> static const char*
> path_namespace_should_match_message_2[] = {
>+  "type='signal',path_namespace='/'",
>   "type='signal',path_namespace='/foo/TheObjectManager'",
>   NULL
> };
>@@ -2744,6 +2749,7 @@ path_namespace_should_not_match_message_2[] = {
> 
> static const char*
> path_namespace_should_match_message_3[] = {
>+  "type='signal',path_namespace='/'",
>   NULL
> };
> 
>@@ -2753,12 +2759,25 @@ path_namespace_should_not_match_message_3[] = {
>   NULL
> };
> 
>+static const char*
>+path_namespace_should_match_message_4[] = {
>+  "type='signal',path_namespace='/'",
>+  NULL
>+};
>+
>+static const char*
>+path_namespace_should_not_match_message_4[] = {
>+  "type='signal',path_namespace='/foo/TheObjectManager'",
>+  NULL
>+};
>+
> static void
> test_matching_path_namespace (void)
> {
>   DBusMessage *message1;
>   DBusMessage *message2;
>   DBusMessage *message3;
>+  DBusMessage *message4;
> 
>   message1 = dbus_message_new (DBUS_MESSAGE_TYPE_SIGNAL);
>   _dbus_assert (message1 != NULL);
>@@ -2775,6 +2794,11 @@ test_matching_path_namespace (void)
>   if (!dbus_message_set_path (message3, "/foo/TheObjectManagerOther"))
>     _dbus_assert_not_reached ("oom");
> 
>+  message4 = dbus_message_new (DBUS_MESSAGE_TYPE_SIGNAL);
>+  _dbus_assert (message4 != NULL);
>+  if (!dbus_message_set_path (message4, "/"))
>+    _dbus_assert_not_reached ("oom");
>+
>   check_matching (message1, 1,
>                   path_namespace_should_match_message_1,
>                   path_namespace_should_not_match_message_1);
>@@ -2784,7 +2808,11 @@ test_matching_path_namespace (void)
>   check_matching (message3, 3,
>                   path_namespace_should_match_message_3,
>                   path_namespace_should_not_match_message_3);
>+  check_matching (message4, 4,
>+                  path_namespace_should_match_message_4,
>+                  path_namespace_should_not_match_message_4);
> 
>+  dbus_message_unref (message4);
>   dbus_message_unref (message3);
>   dbus_message_unref (message2);
>   dbus_message_unref (message1);
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 70799: 88037

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.