Merge pull request #129 from zhangxianbing/master

Fix setlocale usage in utf8_decode function
p-ranav · Nov 21, 2023 · 222382c · 222382c
2 parents ef71abd + 68d059d
commit 222382c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/include/indicators/display_width.hpp b/include/indicators/display_width.hpp
@@ -311,7 +311,10 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
 // convert UTF-8 string to wstring
 #ifdef _MSC_VER
 static inline std::wstring utf8_decode(const std::string& s) {
-    std::string curLocale = setlocale(LC_ALL, "");
+    auto r = setlocale(LC_ALL, "");
+    std::string curLocale;
+    if (r)
+      curLocale = r;
     const char* _Source = s.c_str();
     size_t _Dsize = std::strlen(_Source) + 1;
     wchar_t* _Dest = new wchar_t[_Dsize];
@@ -324,7 +327,10 @@ static inline std::wstring utf8_decode(const std::string& s) {
 }
 #else 
 static inline std::wstring utf8_decode(const std::string& s) {
-    std::string curLocale = setlocale(LC_ALL, "");
+    auto r = setlocale(LC_ALL, "");
+    std::string curLocale;
+    if (r)
+      curLocale = r;
     const char* _Source = s.c_str();
     size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
     wchar_t* _Dest = new wchar_t[_Dsize];

diff --git a/single_include/indicators/indicators.hpp b/single_include/indicators/indicators.hpp
@@ -1652,7 +1652,10 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
 // convert UTF-8 string to wstring
 #ifdef _MSC_VER
 static inline std::wstring utf8_decode(const std::string& s) {
-    std::string curLocale = setlocale(LC_ALL, "");
+    auto r = setlocale(LC_ALL, "");
+    std::string curLocale;
+    if (r)
+      curLocale = r;
     const char* _Source = s.c_str();
     size_t _Dsize = std::strlen(_Source) + 1;
     wchar_t* _Dest = new wchar_t[_Dsize];
@@ -1665,7 +1668,10 @@ static inline std::wstring utf8_decode(const std::string& s) {
 }
 #else 
 static inline std::wstring utf8_decode(const std::string& s) {
-    std::string curLocale = setlocale(LC_ALL, "");
+    auto r = setlocale(LC_ALL, "");
+    std::string curLocale;
+    if (r)
+      curLocale = r;
     const char* _Source = s.c_str();
     size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
     wchar_t* _Dest = new wchar_t[_Dsize];