From: Allan Wirth <allan@allanwirth.com>
Date: Thu, 31 Jan 2013 18:55:33 +0000 (-0500)
Subject: conf: Fix a memory access violation resulting from improper error propogation
X-Git-Tag: v1.0.27~14
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=7f2b2c8c1650a1883b48abfcdb455138943854f9;p=alsa-lib.git

conf: Fix a memory access violation resulting from improper error propogation

Fixes an issue where a variable is used undeclared, which can cause seg
faults on some systems if the configuration file is not formatted
properly.

Signed-off-by: Allan Wirth <allan@allanwirth.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/conf.c b/src/conf.c
index ecaa3390..4ba58631 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3530,7 +3530,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
 				if (err < 0)
 					goto _err;
 			}
-		} else if (config_file_open(root, fi[idx].name) < 0)
+		} else if ((err = config_file_open(root, fi[idx].name)) < 0)
 			goto _err;
 	}
 	*dst = NULL;