SystemStats (Linux): Fix locale clobbering

chromadevlabs · chromadevlabs · commit 2da6a5fb621f · 2025-10-28T11:58:54.000Z
This fixes a bug where the wrong locale was being restored when querying locale 
information.
diff --git a/modules/juce_core/native/juce_SystemStats_linux.cpp b/modules/juce_core/native/juce_SystemStats_linux.cpp
@@ -43,10 +43,11 @@ static String getCpuInfo (const char* key)
 
 static String getLocaleValue (nl_item key)
 {
-    auto oldLocale = ::setlocale (LC_ALL, "");
-    auto result = String::fromUTF8 (nl_langinfo (key));
-    ::setlocale (LC_ALL, oldLocale);
-    return result;
+    const String oldLocale { ::setlocale (LC_ALL, nullptr) };
+    const ScopeGuard restore { [oldLocale] { ::setlocale (LC_ALL, oldLocale.toRawUTF8()); } };
+
+    ::setlocale (LC_ALL, ""); // restore locale from env
+    return String::fromUTF8 (nl_langinfo (key));
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,11 @@ static String getCpuInfo (const char* key)`
`43`	`43`
`44`	`44`	`static String getLocaleValue (nl_item key)`
`45`	`45`	`{`
`46`		`- auto oldLocale = ::setlocale (LC_ALL, "");`
`47`		`- auto result = String::fromUTF8 (nl_langinfo (key));`
`48`		`- ::setlocale (LC_ALL, oldLocale);`
`49`		`- return result;`
	`46`	`+ const String oldLocale { ::setlocale (LC_ALL, nullptr) };`
	`47`	`+ const ScopeGuard restore { [oldLocale] { ::setlocale (LC_ALL, oldLocale.toRawUTF8()); } };`
	`48`	`+`
	`49`	`+ ::setlocale (LC_ALL, ""); // restore locale from env`
	`50`	`+ return String::fromUTF8 (nl_langinfo (key));`
`50`	`51`	`}`
`51`	`52`	`#endif`
`52`	`53`