From f2912f5099e401cebacd33bd9da3d8318856e143 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 19 Mar 2011 01:09:41 +0100 Subject: [PATCH 05/23] UCM: Fix empty get_list - initialize returned pointer to NULL Signed-off-by: Jaroslav Kysela --- src/ucm/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ucm/main.c b/src/ucm/main.c index 5de8170..9b450f6 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -75,8 +75,10 @@ static int alloc_str_list(struct list_head *list, int mult, char **result[]) int cnt; cnt = list_count(list) * mult; - if (cnt == 0) + if (cnt == 0) { + *result = NULL; return cnt; + } res = calloc(mult, cnt * sizeof(char *)); if (res == NULL) return -ENOMEM; @@ -912,8 +914,8 @@ static int get_value_list(snd_use_case_mgr_t *uc_mgr, goto __fail; } err = alloc_str_list(&mylist, 1, &res); - *list = (const char **)res; if (err >= 0) { + *list = (const char **)res; list_for_each(pos, &mylist) { val = list_entry(pos, struct myvalue, list); *res = strdup(val->value); -- 1.7.5.3