diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-07-22 22:49:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-07-22 22:49:06 +0200 |
| commit | 41ad33dfe7334705939c9cf8f2e53f8ca1bf62ba (patch) | |
| tree | d645c42514d8fc9f70ca8d987748422f6ee7f358 /src/pulse | |
| parent | e3b0ce57e0f44790bd75412778cce8129e3945eb (diff) | |
| parent | 7e4509f9e5a1add8bd7efaf69cefd35a291b6253 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/introspect.c | 10 |
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); } } |