[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.21-10-g4bcb1a9

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  73ae1fce001253677b7ab633f42d3c3300fe5cf5 (commit)

- Log -----------------------------------------------------------------
4bcb1a9 bluetooth: fix invalid memory access
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/bluetooth-util.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit 4bcb1a909f936a63628273e7d35726bc64785eeb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 13 17:24:37 2010 +0100

    bluetooth: fix invalid memory access
    
    When an GetProperties() reply arrives after we already deleted the
    device structure for it make sure we don't accidentaly touch the
    invalidated object.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=543205

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 795d510..b2c0429 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -342,7 +342,13 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
 /*                  dbus_message_get_interface(p->message), */
 /*                  dbus_message_get_path(p->message)); */
 
-    d = p->call_data;
+    /* We don't use p->call_data here right-away since the device
+     * might already be invalidated at this point */
+
+    if (!(d = pa_hashmap_get(y->devices, dbus_message_get_path(p->message))))
+        return;
+
+    pa_assert(p->call_data == d);
 
     valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
 

-- 
hooks/post-receive
PulseAudio Sound Server