summaryrefslogtreecommitdiffstats
path: root/src/pulse/introspect.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-07-23 15:18:06 +0200
committerLennart Poettering <lennart@poettering.net>2009-07-23 15:18:06 +0200
commit88d5749f6ae8d391963a12a6221f006de2947e50 (patch)
treef1de05b054b1ee8b272804a03b621a1dde1d8416 /src/pulse/introspect.c
parent0225ef68f2876bebd14977882db313fd7f3f6d64 (diff)
parent3d6278bc31aa7053f1228b3d874ba36f50a8c2d5 (diff)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Conflicts: src/daemon/main.c
Diffstat (limited to 'src/pulse/introspect.c')
-rw-r--r--src/pulse/introspect.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 3414f7de..27a587cb 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -212,8 +212,8 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u
pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) {
pa_context_fail(o->context, PA_ERR_PROTOCOL);
- pa_xfree(i.ports);
pa_xfree(i.ports[0]);
+ pa_xfree(i.ports);
pa_proplist_free(i.proplist);
goto finish;
}
@@ -250,6 +250,10 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u
cb(o->context, &i, 0, o->userdata);
}
+ if (i.ports) {
+ pa_xfree(i.ports[0]);
+ pa_xfree(i.ports);
+ }
pa_proplist_free(i.proplist);
}
}
@@ -479,6 +483,10 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command,
cb(o->context, &i, 0, o->userdata);
}
+ if (i.ports) {
+ pa_xfree(i.ports[0]);
+ pa_xfree(i.ports);
+ }
pa_proplist_free(i.proplist);
}
}