diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-12-12 19:08:04 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-12-12 19:08:04 +0000 |
| commit | 1a90c0193042bfc03d56d0f2454e46ec35667f3f (patch) | |
| tree | fc3640746356ba695d66a72274c4a5d75a686b5c | |
| parent | c0dbd2a2b5ce42612b1bffe778d6127682cddb45 (diff) | |
* bus/signal.c: Fix match_rule_equal errata
(CVE-2006-6107 - Patch from Kimmo Hämäläinen
<kimmo.hamalainen@nokia.com>)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bus/signals.c | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -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 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; |