[pulseaudio-commits] Branch 'stable-queue' - 2 commits - src/modules src/pulsecore

[Colin Guthrie]

 src/modules/module-device-manager.c |    3 +++
 src/pulsecore/tagstruct.c           |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit 22c0dcbc080699fb50409ed188a6f8169331d294
Author: Colin Guthrie <colin at mageia.org>
Date:   Mon Jun 6 21:16:11 2011 +0200

    device-manager: Free a hook slot to prevent segv on unload

diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index d1bfcb8..610742f 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -1576,6 +1576,9 @@ void pa__done(pa_module*m) {
     if (u->source_unlink_hook_slot)
         pa_hook_slot_free(u->source_unlink_hook_slot);
 
+    if (u->connection_unlink_hook_slot)
+        pa_hook_slot_free(u->connection_unlink_hook_slot);
+
     if (u->save_time_event)
         u->core->mainloop->time_free(u->save_time_event);
 

commit b3e4152916962f9c750ac61c150b21fbdb788cb6
Author: Colin Guthrie <colin at mageia.org>
Date:   Mon Jun 6 14:56:55 2011 +0200

    pulsecore: Add a couple pa_asserts() on pa_tagstruct* calls.

diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c
index 330b759..06d23ed 100644
--- a/src/pulsecore/tagstruct.c
+++ b/src/pulsecore/tagstruct.c
@@ -228,6 +228,7 @@ void pa_tagstruct_put_channel_map(pa_tagstruct *t, const pa_channel_map *map) {
     unsigned i;
 
     pa_assert(t);
+    pa_assert(map);
     extend(t, 2 + (size_t) map->channels);
 
     t->data[t->length++] = PA_TAG_CHANNEL_MAP;
@@ -242,6 +243,7 @@ void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) {
     pa_volume_t vol;
 
     pa_assert(t);
+    pa_assert(cvolume);
     extend(t, 2 + cvolume->channels * sizeof(pa_volume_t));
 
     t->data[t->length++] = PA_TAG_CVOLUME;