mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-03 09:01:52 -05:00
UCM: Fix empty get_list - initialize returned pointer to NULL
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
60397387ef
commit
f2912f5099
1 changed files with 4 additions and 2 deletions
|
|
@ -75,8 +75,10 @@ static int alloc_str_list(struct list_head *list, int mult, char **result[])
|
||||||
int cnt;
|
int cnt;
|
||||||
|
|
||||||
cnt = list_count(list) * mult;
|
cnt = list_count(list) * mult;
|
||||||
if (cnt == 0)
|
if (cnt == 0) {
|
||||||
|
*result = NULL;
|
||||||
return cnt;
|
return cnt;
|
||||||
|
}
|
||||||
res = calloc(mult, cnt * sizeof(char *));
|
res = calloc(mult, cnt * sizeof(char *));
|
||||||
if (res == NULL)
|
if (res == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
@ -912,8 +914,8 @@ static int get_value_list(snd_use_case_mgr_t *uc_mgr,
|
||||||
goto __fail;
|
goto __fail;
|
||||||
}
|
}
|
||||||
err = alloc_str_list(&mylist, 1, &res);
|
err = alloc_str_list(&mylist, 1, &res);
|
||||||
*list = (const char **)res;
|
|
||||||
if (err >= 0) {
|
if (err >= 0) {
|
||||||
|
*list = (const char **)res;
|
||||||
list_for_each(pos, &mylist) {
|
list_for_each(pos, &mylist) {
|
||||||
val = list_entry(pos, struct myvalue, list);
|
val = list_entry(pos, struct myvalue, list);
|
||||||
*res = strdup(val->value);
|
*res = strdup(val->value);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue