]> git.alsa-project.org Git - alsa-lib.git/commitdiff
ucm: make verb comments optional
authorPierre-Louis Bossart <pierre-louis.bossart@intel.com>
Fri, 28 Jan 2011 05:17:43 +0000 (23:17 -0600)
committerJaroslav Kysela <perex@perex.cz>
Sat, 29 Jan 2011 10:06:39 +0000 (11:06 +0100)
avoid seg fault if no comment is provided

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/parser.c

index f3a75e6d202f624db80ec6087ba89e1262807e0d..010191ce057ea28d71cc29bc7332a4e2bab37dad 100644 (file)
@@ -777,12 +777,17 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
        INIT_LIST_HEAD(&verb->modifier_list);
        INIT_LIST_HEAD(&verb->value_list);
        list_add_tail(&verb->list, &uc_mgr->verb_list);
+       if (use_case_name == NULL)
+               return -EINVAL;
        verb->name = strdup(use_case_name);
        if (verb->name == NULL)
                return -ENOMEM;
-       verb->comment = strdup(comment);
-       if (verb->comment == NULL)
-               return -ENOMEM;
+
+       if (comment != NULL) {
+               verb->comment = strdup(comment);
+               if (verb->comment == NULL)
+                       return -ENOMEM;
+       }
 
        /* open Verb file for reading */
        snprintf(filename, sizeof(filename), "%s/%s/%s",