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

stream-restore: Fix a potential crash in pa_namereg_is_valid_name()

Browse source 
pa_namereg_is_valid_name() will hit an assertion if the name string is
NULL. Maybe it would make sense to change pa_namereg_is_valid_name() so
that it would return false on NULL, but I didn't want to change the
function semantics at this time.

e->device and e->card can be NULL even when device_valid and card_valid
are set to true if the database contains bad data.

I ran into this crash while developing new code, I haven't seen the
crash in the wild.
This commit is contained in:
Tanu Kaskinen 2020-05-26 14:57:42 +03:00 • committed by Georg Chini
parent 46c263acc9
commit 2ac2b445fc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-stream-restore.c
View file

@ -1144,12 +1144,12 @@ static struct entry *entry_read(struct userdata *u, const char *name) {
if (!pa_tagstruct_eof(t)) if (!pa_tagstruct_eof(t))
goto fail; goto fail;
if (e->device_valid && !pa_namereg_is_valid_name(e->device)) { if (e->device_valid && (!e->device || !pa_namereg_is_valid_name(e->device))) {
pa_log_warn("Invalid device name stored in database for stream %s", name); pa_log_warn("Invalid device name stored in database for stream %s", name);
goto fail; goto fail;
} }
if (e->card_valid && !pa_namereg_is_valid_name(e->card)) { if (e->card_valid && (!e->card || !pa_namereg_is_valid_name(e->card))) {
pa_log_warn("Invalid card name stored in database for stream %s", name); pa_log_warn("Invalid card name stored in database for stream %s", name);
goto fail; goto fail;
} }