[vlc-devel] [PATCH alsa-lib] Use thread-safe locale functions

Rémi Denis-Courmont remi at remlab.net
Tue Apr 13 16:55:35 CEST 2010


setlocale() is not thread-safe. It can actually trigger a crash if
another thread uses locale informations at the same time in the process.
Library code should use POSIX newlocale/duplocale/uselocale/freelocale
instead. Those functions only change the locale data for the calling
thread.
---
 src/conf.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index 570c90f..ce252ab 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -499,22 +499,20 @@ static int safe_strtod(const char *str, double *val)
 {
 	char *end;
 	double v;
-	char *saved_locale;
-	char locstr[64]; /* enough? */
+	locale_t saved_locale, c_locale;
 	int err;
 
 	if (!*str)
 		return -EINVAL;
-	saved_locale = setlocale(LC_NUMERIC, NULL);
-	if (saved_locale) {
-		snprintf(locstr, sizeof(locstr), "%s", saved_locale);
-		setlocale(LC_NUMERIC, "C");
-	}
+	c_locale = newlocale(LC_NUMERIC_MASK, "C", 0);
+	saved_locale = uselocale(c_locale);
 	errno = 0;
 	v = strtod(str, &end);
 	err = -errno;
-	if (saved_locale)
-		setlocale(LC_NUMERIC, locstr);
+	if (c_locale != (locale_t)0) {
+		uselocale(saved_locale);
+		freelocale(c_locale);
+	}
 	if (err)
 		return err;
 	if (*end)
-- 
1.7.0.4




More information about the vlc-devel mailing list