From fa104721f0eab94a7e3fb6b48cfeb8cdcfe011cc Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 18 Jul 2007 21:43:23 +0000 Subject: 2007-07-18 Havoc Pennington * dbus/dbus-message.c (dbus_message_get_cached) (dbus_message_cache_or_finalize): don't mess with message from message cache outside of the cache lock. Bug #9164 from Jonathan Matthew. --- ChangeLog | 7 +++++++ dbus/dbus-message.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3c20041..a744539a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-18 Havoc Pennington + + * dbus/dbus-message.c (dbus_message_get_cached) + (dbus_message_cache_or_finalize): don't mess with message from + message cache outside of the cache lock. Bug #9164 from Jonathan + Matthew. + 2007-07-10 Havoc Pennington * dbus/dbus-connection.c (struct DBusConnection): Fix from Olivier diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 983543da..31869cb7 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -482,10 +482,10 @@ dbus_message_get_cached (void) _dbus_assert (i < MAX_MESSAGE_CACHE_SIZE); _dbus_assert (message != NULL); - _DBUS_UNLOCK (message_cache); - _dbus_assert (message->refcount.value == 0); _dbus_assert (message->size_counters == NULL); + + _DBUS_UNLOCK (message_cache); return message; } @@ -571,10 +571,10 @@ dbus_message_cache_or_finalize (DBusMessage *message) #endif out: - _DBUS_UNLOCK (message_cache); - _dbus_assert (message->refcount.value == 0); + _DBUS_UNLOCK (message_cache); + if (!was_cached) dbus_message_finalize (message); } -- cgit v1.2.1