blueness 15/06/06 18:15:26 Added: musl-1.1.10-uselocale-0-fix.diff Log: Add patch to fix uselocale regresson. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.1 sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff?rev=1.1&content-type=text/plain Index: musl-1.1.10-uselocale-0-fix.diff =================================================================== >From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001 From: Timo Teräs <[email protected]> Date: Fri, 05 Jun 2015 07:39:42 +0000 Subject: fix uselocale((locale_t)0) not to modify locale commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to be assigned unconditonally resulting in crashes later on. --- diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c index b70a0c1..0fc5ecb 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; } -- cgit v0.9.0.3-65-g4555
