From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 21 Jan 2005 19:35:26 +0000 (+0000)
Subject: Check error values
X-Git-Tag: v1.0.9rc1~45
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1fb6e88716ef2573f26f85330038c5e76d886b46;p=alsa-lib.git

Check error values

Check error values from some functions which were ignored.
---

diff --git a/src/confmisc.c b/src/confmisc.c
index a11326fe..981c9efc 100644
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -268,7 +268,12 @@ int snd_func_getenv(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
 			}
 			if (i == idx) {
 				idx++;
-				snd_config_get_string(n, &ptr);
+				err = snd_config_get_string(n, &ptr);
+				if (err < 0) {
+					SNDERR("invalid string for id %s", id);
+					err = -EINVAL;
+					goto __error;
+				}
 				env = getenv(ptr);
 				if (env != NULL && *env != '\0') {
 					res = strdup(env);
@@ -404,8 +409,13 @@ int snd_func_concat(snd_config_t **dst, snd_config_t *root, snd_config_t *src,
 			}
 			if (i == idx) {
 				idx++;
-				snd_config_get_ascii(n, &ptr);
-					len1 = strlen(ptr);
+				err = snd_config_get_ascii(n, &ptr);
+				if (err < 0) {
+					SNDERR("invalid ascii string for id %s", id);
+					err = -EINVAL;
+					goto __error;
+				}
+				len1 = strlen(ptr);
 				tmp = realloc(res, len + len1 + 1);
 				if (tmp == NULL) {
 					free(ptr);