X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasics%2FBasics_Utils.cxx;h=d5de49184e28902721d9d2492375f71ca81a5243;hb=1bbffef73eeeb5b2a14d8fc7bdf91affdafae664;hp=2ef4de8e006545a569982ff4871a11f5a9e88371;hpb=e83c49c22e04a5719890de53f54160295864f900;p=modules%2Fkernel.git

diff --git a/src/Basics/Basics_Utils.cxx b/src/Basics/Basics_Utils.cxx
index 2ef4de8e0..d5de49184 100644
--- a/src/Basics/Basics_Utils.cxx
+++ b/src/Basics/Basics_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,8 @@
 #include <execinfo.h>
 #endif
 
+#include <memory>
+#include <functional>
 
 namespace Kernel_Utils
 {
@@ -144,7 +146,8 @@ namespace Kernel_Utils
 
   std::string encode_s(const wchar_t* decoded)
   {
-    return std::string(encode(decoded));
+    std::unique_ptr<char,std::function<void(char*)>> tmp((char *)encode(decoded),[](char *ptr) { delete [] ptr; });
+    return std::string(tmp.get());
   }
 
 #ifndef WIN32
@@ -172,7 +175,7 @@ namespace Kernel_Utils
   {
     std::stringstream sstr;
     sstr<<name<<'='<<value;
-    if(rewrite || std::string(getenv(name)).length() == 0)
+    if(rewrite || getenv(name) == nullptr || std::string(getenv(name)).length() == 0)
       return _putenv(sstr.str().c_str());
     else return -1;
   }
@@ -184,9 +187,9 @@ namespace Kernel_Utils
   char* utf8_encode(const wchar_t* encoded)
   {
 	  if (encoded == NULL) return NULL;
-	  int size_needed = WideCharToMultiByte(CP_UTF8, 0, encoded, std::wcslen(encoded), NULL, 0, NULL, NULL);
+    auto size_needed = WideCharToMultiByte(CP_UTF8, 0, encoded, (int)std::wcslen(encoded), NULL, 0, NULL, NULL);
 	  char* strTo = new char[ size_needed + 1 ];
-	  WideCharToMultiByte(CP_UTF8, 0, encoded, std::wcslen(encoded), strTo, size_needed, NULL, NULL);
+	  WideCharToMultiByte(CP_UTF8, 0, encoded, (int)std::wcslen(encoded), strTo, size_needed, NULL, NULL);
 	  strTo[size_needed] = '\0';
 	  return strTo;
   }
@@ -194,9 +197,9 @@ namespace Kernel_Utils
   wchar_t* utf8_decode(const char* decoded)
   {
 	  if (decoded == NULL) return NULL;
-	  int size_needed = MultiByteToWideChar(CP_UTF8, 0, decoded, strlen(decoded), NULL, 0);
+    auto size_needed = MultiByteToWideChar(CP_UTF8, 0, decoded, (int)strlen(decoded), NULL, 0);
 	  wchar_t* wstrTo = new wchar_t[ size_needed + 1 ];
-	  MultiByteToWideChar(CP_UTF8, 0, decoded, strlen(decoded), wstrTo, size_needed);
+	  MultiByteToWideChar(CP_UTF8, 0, decoded, (int)strlen(decoded), wstrTo, size_needed);
 	  wstrTo[size_needed] = '\0';
 	  return wstrTo;
   }