OSDN Git Service

always handle return value from snd_config_get_id() (coverity)
authorJaroslav Kysela <perex@perex.cz>
Mon, 27 Feb 2017 08:26:33 +0000 (09:26 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 27 Feb 2017 08:26:33 +0000 (09:26 +0100)
src/pcm/pcm_rate.c
src/topology/data.c

index 46eb797..f60b0ae 100644 (file)
@@ -1339,7 +1339,8 @@ static int is_string_array(const snd_config_t *conf)
        if (i && i != snd_config_iterator_end(conf)) {
                snd_config_t *n = snd_config_iterator_entry(i);
                const char *id;
-               snd_config_get_id(n, &id);
+               if (snd_config_get_id(n, &id) < 0)
+                       return 0;
                if (id && strcmp(id, "0") != 0)
                        return 0;
        }
@@ -1422,7 +1423,8 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
                snd_config_for_each(i, next, converter) {
                        snd_config_t *n = snd_config_iterator_entry(i);
                        const char *id;
-                       snd_config_get_id(n, &id);
+                       if (snd_config_get_id(n, &id) < 0)
+                               continue;
                        if (strcmp(id, "name") != 0)
                                continue;
                        snd_config_get_string(n, &type);
index e2aa38c..8fe2342 100644 (file)
@@ -653,8 +653,8 @@ static int parse_tuple_sets(snd_config_t *cfg,
        int err;
 
        if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) {
-               snd_config_get_id(cfg, &id);
-               SNDERR("error: compound type expected for %s", id);
+               if (snd_config_get_id(cfg, &id) >= 0)
+                       SNDERR("error: compound type expected for %s", id);
                return -EINVAL;
        }