From: John (J5) Palmieri <johnp@redhat.com>
Date: Tue, 12 Dec 2006 19:08:04 +0000 (+0000)
Subject: * bus/signal.c: Fix match_rule_equal errata
X-Git-Tag: dbus-1.0.2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a90c0193042bfc03d56d0f2454e46ec35667f3f;p=thirdparty%2Fdbus.git

* bus/signal.c: Fix match_rule_equal errata
  (CVE-2006-6107 - Patch from Kimmo Hämäläinen
  <kimmo.hamalainen@nokia.com>)
---

diff --git a/ChangeLog b/ChangeLog
index dae3f5fac..be1832dd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-12  John (J5) Palmieri  <johnp@redhat.com>
+
+	* bus/signal.c: Fix match_rule_equal errata
+	(CVE-2006-6107 - Patch from Kimmo Hämäläinen 
+	<kimmo.hamalainen@nokia.com>)
+
 2006-11-19  Thiago Macieira  <thiago@kde.org>
 
 	* dbus/dbus-sysdeps-pthread.c (_dbus_pthread_mutex_lock,
diff --git a/bus/signals.c b/bus/signals.c
index abc387700..a1c684166 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;