diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-07-18 21:43:23 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-07-18 21:43:23 +0000 |
| commit | fa104721f0eab94a7e3fb6b48cfeb8cdcfe011cc (patch) | |
| tree | 73219e9f4f29b07a3b1e87d1421879e0cd7e3488 | |
| parent | fbd1ded1d6fbe94c6188934245f8a4f14ec52e84 (diff) | |
| download | dbus-fa104721f0eab94a7e3fb6b48cfeb8cdcfe011cc.tar.gz | |
2007-07-18 Havoc Pennington <hp@redhat.com>
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2007-07-18 Havoc Pennington <hp@redhat.com> + + * 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 <hp@redhat.com> * 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); } |