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

alsa: don't crash on NULL params

Browse source
This commit is contained in:
Wim Taymans 2022-05-25 15:33:18 +02:00
parent 57e732cd27
commit 16f1d6349d
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -353,7 +353,9 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
case SPA_PARAM_ProcessLatency: case SPA_PARAM_ProcessLatency:
{ {
struct spa_process_latency_info info; struct spa_process_latency_info info;
if ((res = spa_process_latency_parse(param, &info)) < 0) if (param == NULL)
spa_zero(info);
else if ((res = spa_process_latency_parse(param, &info)) < 0)
return res; return res;
handle_process_latency(this, &info); handle_process_latency(this, &info);
@ -694,7 +696,9 @@ impl_node_port_set_param(void *object,
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
{ {
struct spa_latency_info info; struct spa_latency_info info;
if ((res = spa_latency_parse(param, &info)) < 0) if (param == NULL)
info = SPA_LATENCY_INFO(SPA_DIRECTION_REVERSE(direction));
else if ((res = spa_latency_parse(param, &info)) < 0)
return res; return res;
if (direction == info.direction) if (direction == info.direction)
return -EINVAL; return -EINVAL;

8
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -319,7 +319,9 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
case SPA_PARAM_ProcessLatency: case SPA_PARAM_ProcessLatency:
{ {
struct spa_process_latency_info info; struct spa_process_latency_info info;
if ((res = spa_process_latency_parse(param, &info)) < 0) if (param == NULL)
spa_zero(info);
else if ((res = spa_process_latency_parse(param, &info)) < 0)
return res; return res;
handle_process_latency(this, &info); handle_process_latency(this, &info);
@ -631,7 +633,9 @@ impl_node_port_set_param(void *object,
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
{ {
struct spa_latency_info info; struct spa_latency_info info;
if ((res = spa_latency_parse(param, &info)) < 0) if (param == NULL)
info = SPA_LATENCY_INFO(SPA_DIRECTION_REVERSE(direction));
else if ((res = spa_latency_parse(param, &info)) < 0)
return res; return res;
if (direction == info.direction) if (direction == info.direction)
return -EINVAL; return -EINVAL;