Merge branch 'dbus-1.10'

This commit is contained in:
Simon McVittie 2015-10-19 16:52:08 +01:00
commit e908ac51cf
2 changed files with 6 additions and 4 deletions

5
NEWS
View file

@ -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

View file

@ -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);