commit aab16e54cb6ab712b477ed9eed8b9aa52098572c
author kkinnunen <kkinnunen@nvidia.com> Sun Dec 13 23:12:31 2015 -0800
committer Commit bot <commit-bot@chromium.org> Sun Dec 13 23:12:31 2015 -0800
tree 8ad14edfeb9c6f134daa0d1f347ba4e85a432f0d
parent 48373921917d9d9cfab71ece8f1ad3a84a5a6033

Try to fix intermittent GrAutoLocaleSetter crashes on Windows

Try to fix intermittent GrAutoLocaleSetter crashes on Windows.
The string returned by setlocale() is only valid up to
next setlocale(), so it can not be fed to setlocale().

Also, libraries such as ANGLE might call setlocale when
inside a callstack containing GrAutoLocaleSetter. This
would render the old locale pointer invalid.

Review URL: https://codereview.chromium.org/1514083002

src/gpu/GrAutoLocaleSetter.h

diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h
index 51164e9..08196de 100644
--- a/src/gpu/GrAutoLocaleSetter.h
+++ b/src/gpu/GrAutoLocaleSetter.h
@@ -10,6 +10,10 @@
 
 #include "GrTypes.h"
 
+#if defined(SK_BUILD_FOR_WIN)
+#include "SkString.h"
+#endif
+
 #if !defined(SK_BUILD_FOR_ANDROID)
 #include <locale.h>
 #endif
@@ -26,8 +30,14 @@
 public:
     GrAutoLocaleSetter (const char* name) {
 #if defined(SK_BUILD_FOR_WIN)
-        fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
-        fOldLocale = setlocale(LC_ALL, name);
+        fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);        
+        char* oldLocale = setlocale(LC_ALL, name);
+        if (oldLocale) {
+            fOldLocale = oldLocale;
+            fShouldRestoreLocale = true;
+        } else {
+            fShouldRestoreLocale = false;
+        }
 #elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
         fLocale = newlocale(LC_ALL, name, 0);
         if (fLocale) {
@@ -42,8 +52,8 @@
 
     ~GrAutoLocaleSetter () {
 #if defined(SK_BUILD_FOR_WIN)
-        if (fOldLocale) {
-            setlocale(LC_ALL, fOldLocale);
+        if (fShouldRestoreLocale) {
+            setlocale(LC_ALL, fOldLocale.c_str());
         }
         _configthreadlocale(fOldPerThreadLocale);
 #elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
@@ -57,7 +67,8 @@
 private:
 #if defined(SK_BUILD_FOR_WIN)
     int fOldPerThreadLocale;
-    const char* fOldLocale;
+    bool fShouldRestoreLocale;
+    SkString fOldLocale;
 #elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
     locale_t fOldLocale;
     locale_t fLocale;