From 8d80d5f344ae5e32d24122cbf8e759fdd1e1a60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 21 Apr 2010 18:37:48 +0200 Subject: [PATCH 02/21] Use thread-safe locale functions if available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Rémi Denis-Courmont Signed-off-by: Jaroslav Kysela --- src/conf.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/conf.c b/src/conf.c index 570c90f..5d8c5c9 100644 --- a/src/conf.c +++ b/src/conf.c @@ -499,22 +499,38 @@ static int safe_strtod(const char *str, double *val) { char *end; double v; +#ifdef HAVE_USELOCALE + locale_t saved_locale, c_locale; +#else char *saved_locale; char locstr[64]; /* enough? */ +#endif int err; if (!*str) return -EINVAL; +#ifdef HAVE_USELOCALE + c_locale = newlocale(LC_NUMERIC_MASK, "C", 0); + saved_locale = uselocale(c_locale); +#else saved_locale = setlocale(LC_NUMERIC, NULL); if (saved_locale) { snprintf(locstr, sizeof(locstr), "%s", saved_locale); setlocale(LC_NUMERIC, "C"); } +#endif errno = 0; v = strtod(str, &end); err = -errno; +#ifdef HAVE_USELOCALE + if (c_locale != (locale_t)0) { + uselocale(saved_locale); + freelocale(c_locale); + } +#else if (saved_locale) setlocale(LC_NUMERIC, locstr); +#endif if (err) return err; if (*end) -- 1.7.2.1