mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-02 09:01:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: Return NULL from get_list0() and get_list20() in case of empty lists.

Browse source 
alloc_str_list() sets the result to NULL too, so this patch
makes the behavior more consistent. This also fixes a crash
in PulseAudio, because PulseAudio assumes that
snd_use_case_get_list() always initializes the result, and
since snd_use_case_get_list() uses get_list20(), this
assumption didn't hold.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Tanu Kaskinen 2012-08-01 16:06:16 +03:00 • committed by Takashi Iwai
parent 480d3204fe
commit e16a9a04b1
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ucm/main.c
View file

@ -367,8 +367,10 @@ static int get_list0(struct list_head *list,
char *ptr, *str1; char *ptr, *str1;
cnt = alloc_str_list(list, 1, &res); cnt = alloc_str_list(list, 1, &res);
if (cnt <= 0) if (cnt <= 0) {
*result = NULL;
return cnt; return cnt;
}
*result = (const char **)res; *result = (const char **)res;
list_for_each(pos, list) { list_for_each(pos, list) {
ptr = list_entry_offset(pos, char, offset); ptr = list_entry_offset(pos, char, offset);
@ -414,8 +416,10 @@ static int get_list20(struct list_head *list,
char *ptr, *str1, *str2; char *ptr, *str1, *str2;
cnt = alloc_str_list(list, 2, &res); cnt = alloc_str_list(list, 2, &res);
if (cnt <= 0) if (cnt <= 0) {
*result = NULL;
return cnt; return cnt;
}
*result = (const char **)res; *result = (const char **)res;
list_for_each(pos, list) { list_for_each(pos, list) {
ptr = list_entry_offset(pos, char, offset); ptr = list_entry_offset(pos, char, offset);