From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timo=20Ter=C3=A4s?= Date: Fri, 5 Jun 2015 10:39:42 +0300 Subject: [PATCH] fix uselocale((locale_t)0) not to modify locale commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to be assigned unconditonally resulting in crashes later on. --- src/locale/uselocale.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c index b70a0c18..0fc5ecbc 100644 --- a/src/locale/uselocale.c +++ b/src/locale/uselocale.c @@ -8,9 +8,7 @@ locale_t __uselocale(locale_t new) locale_t old = self->locale; locale_t global = &libc.global_locale; - if (new == LC_GLOBAL_LOCALE) new = global; - - self->locale = new; + if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new; return old == global ? LC_GLOBAL_LOCALE : old; } -- 2.25.1