mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-18 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

introspect: Fix a bug in sink/source info protocol handling related to ports.

Browse source 
Previously the active_profile was extracted from the tagstruct regardless of
the protocol version which caused errors while speaking to older version
servers.
This commit is contained in:
Colin Guthrie 2009-06-28 11:56:36 +01:00
parent a007d4740f
commit 59376b039e
1 changed files with 62 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

120
src/pulse/introspect.c
View file

@ -201,42 +201,44 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u
goto finish; goto finish;
} }
if (i.n_ports > 0) { if (o->context->version >= 16) {
i.ports = pa_xnew(pa_sink_port_info*, i.n_ports+1); if (i.n_ports > 0) {
i.ports[0] = pa_xnew(pa_sink_port_info, i.n_ports); i.ports = pa_xnew(pa_sink_port_info*, i.n_ports+1);
i.ports[0] = pa_xnew(pa_sink_port_info, i.n_ports);
for (j = 0; j < i.n_ports; j++) { for (j = 0; j < i.n_ports; j++) {
if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 || if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 ||
pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 || pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) { pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) {
pa_context_fail(o->context, PA_ERR_PROTOCOL); pa_context_fail(o->context, PA_ERR_PROTOCOL);
pa_xfree(i.ports); pa_xfree(i.ports);
pa_xfree(i.ports[0]); pa_xfree(i.ports[0]);
pa_proplist_free(i.proplist); pa_proplist_free(i.proplist);
goto finish; goto finish;
}
i.ports[j] = &i.ports[0][j];
} }
i.ports[j] = &i.ports[0][j]; i.ports[j] = NULL;
} }
i.ports[j] = NULL; if (pa_tagstruct_gets(t, &ap) < 0) {
} pa_context_fail(o->context, PA_ERR_PROTOCOL);
pa_xfree(i.ports[0]);
pa_xfree(i.ports);
pa_proplist_free(i.proplist);
goto finish;
}
if (pa_tagstruct_gets(t, &ap) < 0) { if (ap) {
pa_context_fail(o->context, PA_ERR_PROTOCOL); for (j = 0; j < i.n_ports; j++)
pa_xfree(i.ports[0]); if (pa_streq(i.ports[j]->name, ap)) {
pa_xfree(i.ports); i.active_port = i.ports[j];
pa_proplist_free(i.proplist); break;
goto finish; }
} }
if (ap) {
for (j = 0; j < i.n_ports; j++)
if (pa_streq(i.ports[j]->name, ap)) {
i.active_port = i.ports[j];
break;
}
} }
i.mute = (int) mute; i.mute = (int) mute;
@ -428,42 +430,44 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command,
goto finish; goto finish;
} }
if (i.n_ports > 0) { if (o->context->version >= 16) {
i.ports = pa_xnew(pa_source_port_info*, i.n_ports+1); if (i.n_ports > 0) {
i.ports[0] = pa_xnew(pa_source_port_info, i.n_ports); i.ports = pa_xnew(pa_source_port_info*, i.n_ports+1);
i.ports[0] = pa_xnew(pa_source_port_info, i.n_ports);
for (j = 0; j < i.n_ports; j++) { for (j = 0; j < i.n_ports; j++) {
if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 || if (pa_tagstruct_gets(t, &i.ports[0][j].name) < 0 ||
pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 || pa_tagstruct_gets(t, &i.ports[0][j].description) < 0 ||
pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) { pa_tagstruct_getu32(t, &i.ports[0][j].priority) < 0) {
pa_context_fail(o->context, PA_ERR_PROTOCOL); pa_context_fail(o->context, PA_ERR_PROTOCOL);
pa_xfree(i.ports[0]); pa_xfree(i.ports[0]);
pa_xfree(i.ports); pa_xfree(i.ports);
pa_proplist_free(i.proplist); pa_proplist_free(i.proplist);
goto finish; goto finish;
}
i.ports[j] = &i.ports[0][j];
} }
i.ports[j] = &i.ports[0][j]; i.ports[j] = NULL;
} }
i.ports[j] = NULL; if (pa_tagstruct_gets(t, &ap) < 0) {
} pa_context_fail(o->context, PA_ERR_PROTOCOL);
pa_xfree(i.ports[0]);
pa_xfree(i.ports);
pa_proplist_free(i.proplist);
goto finish;
}
if (pa_tagstruct_gets(t, &ap) < 0) { if (ap) {
pa_context_fail(o->context, PA_ERR_PROTOCOL); for (j = 0; j < i.n_ports; j++)
pa_xfree(i.ports[0]); if (pa_streq(i.ports[j]->name, ap)) {
pa_xfree(i.ports); i.active_port = i.ports[j];
pa_proplist_free(i.proplist); break;
goto finish; }
} }
if (ap) {
for (j = 0; j < i.n_ports; j++)
if (pa_streq(i.ports[j]->name, ap)) {
i.active_port = i.ports[j];
break;
}
} }
i.mute = (int) mute; i.mute = (int) mute;