Takashi Iwai
cd5dd1370c
- Backport a few fix patches from upstream, mostly for fixing crashes in multi-thread programs: 0044-configure-do-not-detect-incorrect-cross-compiler.patch 0045-ucm-Set-uc_mgr-ctl-to-NULL-after-closing-it.patch 0046-snd_pcm_direct_parse_open_conf-use-thread-safe-getgr.patch 0047-Add-snd_lib_error_set_local-to-install-a-thread-loca.patch 0048-snd_device_name_hint-do-not-change-the-global-error-.patch 0049-snd_device_name_hint-do-not-use-global-snd_config.patch 0050-conf-Fix-a-memory-access-violation-resulting-from-im.patch OBS-URL: https://build.opensuse.org/request/show/150679 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=123
28 lines
862 B
Diff
28 lines
862 B
Diff
From 7f2b2c8c1650a1883b48abfcdb455138943854f9 Mon Sep 17 00:00:00 2001
|
|
From: Allan Wirth <allan@allanwirth.com>
|
|
Date: Thu, 31 Jan 2013 13:55:33 -0500
|
|
Subject: [PATCH 50/50] 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>
|
|
---
|
|
src/conf.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/src/conf.c
|
|
+++ b/src/conf.c
|
|
@@ -3530,7 +3530,7 @@ int snd_config_hook_load(snd_config_t *r
|
|
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;
|