Merge branch 'dbus-1.10'

diff --git a/NEWS b/NEWS
index d7544df..39cf1cb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,11 @@ Fixes:
   would get the correct reply, but the rest would time out. We now send
   the same error reply to each attempt. (fd.o #92200, Simon McVittie)
 
+• If BecomeMonitor is called with a syntactically invalid match rule,
+  don't crash with an assertion failure, fixing a regression in 1.9.10.
+  This was not exploitable as a denial of service, because the check
+  for a privileged user is done first. (fd.o #92298, Simon McVittie)
+
 • Print 64-bit integers on non-GNU Unix platforms (fd.o #92043, Natanael Copa)
 
 • On Windows, fix the logic for replacing the installation prefix

diff --git a/bus/driver.c b/bus/driver.c
index 379a47e..852ac53 100644 (file)
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -2006,10 +2006,7 @@ bus_driver_handle_become_monitor (DBusConnection *connection,
       rule = bus_match_rule_parse (connection, &str, error);
 
       if (rule == NULL)
-        {
-          BUS_SET_OOM (error);
-          goto out;
-        }
+        goto out;
 
       /* monitors always eavesdrop */
       bus_match_rule_set_client_is_eavesdropping (rule, TRUE);