mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: don't send invalid port profile arrays

Browse source 
libpulse assumes in introspect.c:fill_card_port_info that port profile
array size <= card profile array size, and may crash otherwise.

Enforce this in fill_card_info. It can happen, if EnumRoute and
EnumProfile info is not in sync.
This commit is contained in:
Pauli Virtanen 2021-03-20 15:02:55 +02:00
parent abfa04caa4
commit 7be7b258cb
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -3937,7 +3937,7 @@ static int fill_card_info(struct client *client, struct message *m,
for (n = 0; n < n_ports; n++) { for (n = 0; n < n_ports; n++) {
struct spa_dict_item *items; struct spa_dict_item *items;
struct spa_dict *pdict = NULL, dict; struct spa_dict *pdict = NULL, dict;
uint32_t i; uint32_t i, pi_n_profiles;
pi = &port_info[n]; pi = &port_info[n];
@ -3956,11 +3956,18 @@ static int fill_card_info(struct client *client, struct message *m,
TAG_PROPLIST, pdict, /* port proplist */ TAG_PROPLIST, pdict, /* port proplist */
TAG_INVALID); TAG_INVALID);
pi_n_profiles = SPA_MIN(pi->n_profiles, n_profiles);
if (pi->n_profiles != pi_n_profiles) {
/* libpulse assumes port profile array size <= n_profiles */
pw_log_error(NAME" %p: card %d port %d profiles inconsistent (%d < %d)",
client->impl, o->id, n, n_profiles, pi->n_profiles);
}
message_put(m, message_put(m,
TAG_U32, pi->n_profiles, /* n_profiles */ TAG_U32, pi_n_profiles, /* n_profiles */
TAG_INVALID); TAG_INVALID);
for (i = 0; i < pi->n_profiles; i++) { for (i = 0; i < pi_n_profiles; i++) {
uint32_t idx = pi->profiles[i]; uint32_t idx = pi->profiles[i];
message_put(m, message_put(m,
TAG_STRING, idx < n_profiles ? TAG_STRING, idx < n_profiles ?