[pulseaudio-commits] src/modules

[Arun Raghavan]

 src/modules/alsa/alsa-mixer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 13a84d0747c9fe114850477460f2ac68cba0c4b6
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Feb 15 16:51:31 2012 +0100

    alsa-mixer: Don't use dangling pointers as port hashmap keys
    
    If alsa settings/options were used, the string to construct the
    name was freed, leading to dangling pointers to strings inside
    the hashmap.
    
    BugLink: https://bugs.launchpad.net/bugs/932804
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 9bf8069..7e6ef54 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4397,7 +4397,7 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports,
 
         p = pa_device_port_new(core, name, description, sizeof(pa_alsa_port_data));
         pa_assert(p);
-        pa_hashmap_put(ports, name, p);
+        pa_hashmap_put(ports, p->name, p);
         p->profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 
         data = PA_DEVICE_PORT_DATA(p);
@@ -4412,7 +4412,7 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports,
         pa_hashmap_put(p->profiles, cp->name, cp);
 
     if (extra) {
-        pa_hashmap_put(extra, name, p);
+        pa_hashmap_put(extra, p->name, p);
         pa_device_port_ref(p);
     }