From 6cdf261747895e20b66ea8c615de49aa79f34c6b Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 12 Dec 2006 19:08:04 +0000 Subject: =?UTF-8?q?*=20bus/signal.c:=20Fix=20match=5Frule=5Fequal=20errata?= =?UTF-8?q?=20=20=20(CVE-2006-6107=20-=20Patch=20from=20Kimmo=20H=C3=A4m?= =?UTF-8?q?=C3=A4l=C3=A4inen=20=20=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 6 ++++++ bus/signals.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 79b68edf..7cd50349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-12 John (J5) Palmieri + + * bus/signal.c: Fix match_rule_equal errata + (CVE-2006-6107 - Patch from Kimmo Hämäläinen + ) + 2006-11-19 Thiago Macieira * dbus/dbus-sysdeps-pthread.c (_dbus_pthread_mutex_lock, diff --git a/bus/signals.c b/bus/signals.c index abc38770..a1c68416 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a, if (a->flags != b->flags) return FALSE; + if (a->matches_go_to != b->matches_go_to) + return FALSE; + if ((a->flags & BUS_MATCH_MESSAGE_TYPE) && a->message_type != b->message_type) return FALSE; -- cgit v1.2.1