MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-16 01:03:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

[alsa] multi alsa cfg section SEGV with no nickname - use 'card' when not specified

Browse Source
This commit is contained in:
whatdoineed2do/Ray 2020-01-06 15:38:32 +00:00
parent cc78926721
commit 609cba5f04
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/outputs/alsa.c
View File

@ -1188,13 +1188,13 @@ alsa_device_add(cfg_t* cfg_audio, int id)
{ {
struct output_device *device; struct output_device *device;
struct alsa_extra *ae; struct alsa_extra *ae;
const char *nickname;
int ret; int ret;
CHECK_NULL(L_LAUDIO, device = calloc(1, sizeof(struct output_device))); CHECK_NULL(L_LAUDIO, device = calloc(1, sizeof(struct output_device)));
CHECK_NULL(L_LAUDIO, ae = calloc(1, sizeof(struct alsa_extra))); CHECK_NULL(L_LAUDIO, ae = calloc(1, sizeof(struct alsa_extra)));
device->id = id; device->id = id;
device->name = strdup(cfg_getstr(cfg_audio, "nickname"));
device->type = OUTPUT_TYPE_ALSA; device->type = OUTPUT_TYPE_ALSA;
device->type_name = outputs_name(device->type); device->type_name = outputs_name(device->type);
device->extra_device_info = ae; device->extra_device_info = ae;
@ -1205,6 +1205,9 @@ alsa_device_add(cfg_t* cfg_audio, int id)
if (!ae->card_name) if (!ae->card_name)
ae->card_name = cfg_getstr(cfg_audio, "card"); ae->card_name = cfg_getstr(cfg_audio, "card");
nickname = cfg_getstr(cfg_audio, "nickname");
device->name = strdup(nickname ? nickname : ae->card_name);
ae->mixer_name = cfg_getstr(cfg_audio, "mixer"); ae->mixer_name = cfg_getstr(cfg_audio, "mixer");
ae->mixer_device_name = cfg_getstr(cfg_audio, "mixer_device"); ae->mixer_device_name = cfg_getstr(cfg_audio, "mixer_device");
if (!ae->mixer_device_name || strlen(ae->mixer_device_name) == 0) if (!ae->mixer_device_name || strlen(ae->mixer_device_name) == 0)