Merge pull request xbmc#18903 from Paxxi/fix_python_init

Fix a crash during python init
basilgello · Dec 7, 2020 · 8cc9e80 · 8cc9e80
2 parents f98835b + 576b51f
commit 8cc9e80
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/project/BuildDependencies/scripts/0_package.target-win10-arm.list b/project/BuildDependencies/scripts/0_package.target-win10-arm.list
@@ -34,7 +34,7 @@ openssl-1.1.1d-win10-arm-v141-20200105.7z
 pcre-8.43-win10-arm-v141-20200105.7z
 pillow-6.2.1-win10-arm-v142-20200803.7z
 pycryptodome-3.9.4-win10-arm-v142-20200803.7z
-python-3.8.5-win10-arm-v142-20200803.7z
+python-3.8.5-win10-arm-v142-20201205.7z
 rapidjson-1.1.0-20200105.7z
 spdlog-1.5.0-win10-arm-v141-20200320-2.7z
 sqlite-3300100-win10-arm-v141-20200105.7z

diff --git a/project/BuildDependencies/scripts/0_package.target-win10-win32.list b/project/BuildDependencies/scripts/0_package.target-win10-win32.list
@@ -34,7 +34,7 @@ openssl-1.1.1d-win10-win32-v141-20200105.7z
 pcre-8.43-win10-win32-v141-20200105.7z
 pillow-6.2.1-win10-win32-v142-20200803.7z
 pycryptodome-3.9.4-win10-win32-v142-20200803.7z
-python-3.8.5-win10-win32-v142-20200803.7z
+python-3.8.5-win10-win32-v142-20201205.7z
 rapidjson-1.1.0-20200105.7z
 spdlog-1.5.0-win10-win32-v141-20200320-2.7z
 sqlite-3300100-win10-win32-v141-20200105.7z

diff --git a/project/BuildDependencies/scripts/0_package.target-win10-x64.list b/project/BuildDependencies/scripts/0_package.target-win10-x64.list
@@ -34,7 +34,7 @@ openssl-1.1.1d-win10-x64-v141-20200105.7z
 pcre-8.43-win10-x64-v141-20200105.7z
 pillow-6.2.1-win10-x64-v142-20200803.7z
 pycryptodome-3.9.4-win10-x64-v142-20200803.7z
-python-3.8.5-win10-x64-v142-20200803.7z
+python-3.8.5-win10-x64-v142-20201205.7z
 rapidjson-1.1.0-20200105.7z
 spdlog-1.5.0-win10-x64-v141-20200320.7z
 sqlite-3300100-win10-x64-v141-20200105.7z

diff --git a/project/BuildDependencies/scripts/0_package.target-win32.list b/project/BuildDependencies/scripts/0_package.target-win32.list
@@ -41,7 +41,7 @@ openssl-1.1.1d-win10-win32-v141-20200105.7z
 pcre-8.43-win32-v141-20200105.7z
 pillow-6.2.1-win32-v142-20200803.7z
 pycryptodome-3.9.4-win32-v142-20200803.7z
-python-3.8.5-win32-v142-20200803.7z
+python-3.8.5-win32-v142-20201205.7z
 rapidjson-1.1.0-20200105.7z
 shairplay-ce80e00-win32-v141-20200105.7z
 spdlog-1.5.0-win32-v141-20200320-2.7z

diff --git a/project/BuildDependencies/scripts/0_package.target-x64.list b/project/BuildDependencies/scripts/0_package.target-x64.list
@@ -38,7 +38,7 @@ openssl-1.1.1d-x64-v141-20200105.7z
 pcre-8.43-x64-v141-20200105.7z
 pillow-6.2.1-x64-v142-20200803.7z
 pycryptodome-3.9.4-x64-v142-20200803.7z
-python-3.8.5-x64-v142-20200803.7z
+python-3.8.5-x64-v142-20201205.7z
 rapidjson-1.1.0-20200105.7z
 shairplay-ce80e00-x64-v141-20200105.7z
 spdlog-1.5.0-x64-v141-20200320.7z

diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
@@ -28,6 +28,7 @@
 #include "utils/JSONVariantWriter.h"
 #include "utils/Variant.h"
 #include "utils/log.h"
+#include "utils/CharsetConverter.h"
 
 #ifdef TARGET_WINDOWS
 #include "platform/Environment.h"
@@ -501,10 +502,14 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker* invoker)
     CEnvironment::putenv(buf);
     buf = "PYTHONOPTIMIZE=1";
     CEnvironment::putenv(buf);
-    buf = "PYTHONHOME=" + CSpecialProtocol::TranslatePath("special://xbmc/system/python");
-    CEnvironment::putenv(buf);
     buf = "OS=win32";
     CEnvironment::putenv(buf);
+
+    std::wstring pythonHomeW;
+    CCharsetConverter::utf8ToW(CSpecialProtocol::TranslatePath("special://xbmc/system/python"),
+                           pythonHomeW);
+    Py_SetPythonHome(pythonHomeW.c_str());
+
 #ifdef _DEBUG
     if (CSysInfo::GetWindowsDeviceFamily() == CSysInfo::Xbox)
       CEnvironment::putenv("PYTHONCASEOK=1");