Merge pull request #125 from microsoft/pal/1.6.11-0

1.6.11-0
microsoft · Dec 7, 2022 · bb88c49 · bb88c49
2 parents 637d092 + d2db43e
commit bb88c49
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/source/code/scxcorelib/util/scxstream.cpp b/source/code/scxcorelib/util/scxstream.cpp
@@ -27,6 +27,7 @@
 
 #if defined(sun)
 
+#include <scxcorelib/scxthreadlock.h>
 #include <iconv.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -655,7 +656,7 @@ namespace SCXCoreLib {
         }
 
         static const unsigned int BUFSIZE = 10;
-
+        SCXCoreLib::SCXThreadLock lock(SCXCoreLib::ThreadLockHandleGet(L"IconvLock"));
         iconv_t ic = SCXCoreLib::SCXLocaleContext::GetToUTF8iconv();
 
         if (ic == NULL)