mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: don't leak format info

Browse source
This commit is contained in:
Wim Taymans 2021-09-07 09:51:58 +02:00
parent 8bb0e340c7
commit 7e4d5b142f
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-protocol-pulse/extensions/ext-device-restore.c
View file

@ -94,8 +94,10 @@ static int do_sink_read_format(void *data, struct pw_manager_object *o)
spa_zero(info[n_info]); spa_zero(info[n_info]);
if (format_info_from_param(&info[n_info], p->param, index++) < 0) if (format_info_from_param(&info[n_info], p->param, index++) < 0)
break; break;
if (info[n_info].encoding == ENCODING_ANY) if (info[n_info].encoding == ENCODING_ANY) {
format_info_clear(&info[n_info]);
continue; continue;
}
n_info++; n_info++;
} }
} }
@ -108,6 +110,7 @@ static int do_sink_read_format(void *data, struct pw_manager_object *o)
message_put(d->reply, message_put(d->reply,
TAG_FORMAT_INFO, &info[i], TAG_FORMAT_INFO, &info[i],
TAG_INVALID); TAG_INVALID);
format_info_clear(&info[i]);
} }
return 0; return 0;
} }
@ -255,6 +258,7 @@ static int do_extension_device_restore_save_formats(struct client *client,
for (i = 0; i < n_formats; ++i) { for (i = 0; i < n_formats; ++i) {
struct format_info format; struct format_info format;
spa_zero(format);
if (message_get(m, if (message_get(m,
TAG_FORMAT_INFO, &format, TAG_FORMAT_INFO, &format,
TAG_INVALID) < 0) TAG_INVALID) < 0)
@ -263,6 +267,8 @@ static int do_extension_device_restore_save_formats(struct client *client,
codec = format_encoding2id(format.encoding); codec = format_encoding2id(format.encoding);
if (codec != SPA_ID_INVALID && n_codecs < SPA_N_ELEMENTS(iec958codecs)) if (codec != SPA_ID_INVALID && n_codecs < SPA_N_ELEMENTS(iec958codecs))
iec958codecs[n_codecs++] = codec; iec958codecs[n_codecs++] = codec;
format_info_clear(&format);
} }
if (n_codecs == 0) if (n_codecs == 0)
return -ENOTSUP; return -ENOTSUP;