mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-09 08:21:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter-chain: don't corrupt the enumerated properties

Browse source 
When we add a Format property after we dereffed all the other params in
the builder, we might relocate the builder memory and invalidate all
previously dereffed params, causing corruption.

Instead, first add all the params to the builder and then deref the
params.

There is a special case when we have both a capture and playback
stream. The capture stream will receive all filter params and the
playback stream will just receive its Format param.

Fixes #5202
This commit is contained in:
Wim Taymans 2026-04-08 17:49:41 +02:00
parent d6adf944df
commit cf88df2185
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/module-filter-chain.c
View file

@ -1702,6 +1702,19 @@ static int setup_streams(struct impl *impl)
spa_process_latency_build(&b.b, spa_process_latency_build(&b.b,
SPA_PARAM_ProcessLatency, &impl->process_latency); SPA_PARAM_ProcessLatency, &impl->process_latency);
if (impl->capture || impl->playback) {
if ((offs = pw_array_add(&offsets, sizeof(uint32_t))) != NULL)
*offs = b.b.state.offset;
if (impl->capture)
spa_format_audio_raw_build(&b.b,
SPA_PARAM_EnumFormat, &impl->capture_info);
else
spa_format_audio_raw_build(&b.b,
SPA_PARAM_EnumFormat, &impl->playback_info);
}
n_params = pw_array_get_len(&offsets, uint32_t); n_params = pw_array_get_len(&offsets, uint32_t);
if (n_params == 0) { if (n_params == 0) {
res = -ENOMEM; res = -ENOMEM;
@ -1717,8 +1730,6 @@ static int setup_streams(struct impl *impl)
params[i] = spa_pod_builder_deref(&b.b, offs[i]); params[i] = spa_pod_builder_deref(&b.b, offs[i]);
if (impl->capture) { if (impl->capture) {
params[n_params++] = spa_format_audio_raw_build(&b.b,
SPA_PARAM_EnumFormat, &impl->capture_info);
flags = PW_STREAM_FLAG_AUTOCONNECT | flags = PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS; PW_STREAM_FLAG_RT_PROCESS;
@ -1739,8 +1750,9 @@ static int setup_streams(struct impl *impl)
spa_pod_dynamic_builder_init(&b, NULL, 0, 4096); spa_pod_dynamic_builder_init(&b, NULL, 0, 4096);
} }
if (impl->playback) { if (impl->playback) {
params[n_params++] = spa_format_audio_raw_build(&b.b, if (n_params == 0)
SPA_PARAM_EnumFormat, &impl->playback_info); params[n_params++] = spa_format_audio_raw_build(&b.b,
SPA_PARAM_EnumFormat, &impl->playback_info);
flags = PW_STREAM_FLAG_AUTOCONNECT | flags = PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |