47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
|
From 8a38461fac67f6542308063ba8e9887a1a2fa84e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
||
|
|
Date: Mon, 27 Feb 2017 09:26:33 +0100
|
||
|
|
Subject: [PATCH 34/43] always handle return value from snd_config_get_id()
|
||
|
|
(coverity)
|
||
|
|
|
||
|
|
---
|
||
|
|
src/pcm/pcm_rate.c | 6 ++++--
|
||
|
|
src/topology/data.c | 4 ++--
|
||
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/src/pcm/pcm_rate.c
|
||
|
|
+++ b/src/pcm/pcm_rate.c
|
||
|
|
@@ -1339,7 +1339,8 @@ static int is_string_array(const snd_con
|
||
|
|
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,
|
||
|
|
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);
|
||
|
|
--- a/src/topology/data.c
|
||
|
|
+++ b/src/topology/data.c
|
||
|
|
@@ -653,8 +653,8 @@ static int parse_tuple_sets(snd_config_t
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|