1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Fix crash on macOS if no python path is set in configuration

Browse Source 
Obvious fix guarding against calling the std::string constructor with
a NULL pointer.
This commit is contained in:
PatTheMav 2022-07-23 16:18:35 +02:00 committed by Matt Gajownik
parent 5ea10fec82
commit 1766f01b7a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/frontend-plugins/frontend-tools/scripts.cpp
View File

@ -653,8 +653,10 @@ extern "C" void InitScripts()
config_get_string(config, "Python", "Path" ARCH_NAME); config_get_string(config, "Python", "Path" ARCH_NAME);
#ifdef __APPLE__ #ifdef __APPLE__
if (python_path && *python_path) {
std::string _python_path(python_path); std::string _python_path(python_path);
std::size_t pos = _python_path.find("/Python.framework/Versions"); std::size_t pos =
_python_path.find("/Python.framework/Versions");
if (pos != std::string::npos) { if (pos != std::string::npos) {
std::string _temp = _python_path.substr(0, pos); std::string _temp = _python_path.substr(0, pos);
@ -663,6 +665,7 @@ extern "C" void InitScripts()
config_save(config); config_save(config);
python_path = _temp.c_str(); python_path = _temp.c_str();
} }
}
#endif #endif
if (!obs_scripting_python_loaded() && python_path && *python_path) if (!obs_scripting_python_loaded() && python_path && *python_path)