From f6bdda044cb4fb4135a4dddc6e33e4b7caed86bb Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Tue, 2 Apr 2013 15:48:56 +0000 Subject: [PATCH] Reference: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130325/077132.html git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178545 91177308-0d34-0410-b5e6-96231b3b80d8 --- src/support/win32/locale_win32.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/support/win32/locale_win32.cpp b/src/support/win32/locale_win32.cpp index 02b5874e2..e8c630c1f 100644 --- a/src/support/win32/locale_win32.cpp +++ b/src/support/win32/locale_win32.cpp @@ -20,6 +20,8 @@ locale_t newlocale( int mask, const char * locale, locale_t /*base*/ ) locale_t uselocale( locale_t newloc ) { locale_t old_locale = _get_current_locale(); + if ( newloc == NULL ) + return old_locale; // uselocale sets the thread's locale by definition, so unconditionally use thread-local locale _configthreadlocale( _ENABLE_PER_THREAD_LOCALE ); // uselocale sets all categories