kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Fix #12061

Browse Source 
While rebasing after f539138dd9 ("fix readability-*:") a mistake was
make, causing  exception been thrown for every file opened. While there,
invert file test existence logic, so we return early on failure.

Fixes: 95b37fa806 ("Base: Do not use else before return")
This commit is contained in:
Ladislav Michl
2024-01-27 21:18:20 +01:00
committed by Yorik van Havre
parent a025af2d26
commit 1215301e59
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/Base/Interpreter.cpp
View File

@@ -438,48 +438,49 @@ void InterpreterSingleton::runFile(const char* pxFileName, bool local)
#else
FILE* fp = fopen(pxFileName, "r");
#endif
if (fp) {
PyGILStateLocker locker;
PyObject* module {};
PyObject* dict {};
module = PyImport_AddModule("__main__");
dict = PyModule_GetDict(module);
if (local) {
dict = PyDict_Copy(dict);
}
else {
Py_INCREF(dict); // avoid to further distinguish between local and global dict
}
if (!PyDict_GetItemString(dict, "__file__")) {
PyObject* pyObj = PyUnicode_FromString(pxFileName);
if (!pyObj) {
fclose(fp);
Py_DECREF(dict);
return;
}
if (PyDict_SetItemString(dict, "__file__", pyObj) < 0) {
Py_DECREF(pyObj);
fclose(fp);
Py_DECREF(dict);
return;
}
Py_DECREF(pyObj);
}
PyObject* result = PyRun_File(fp, pxFileName, Py_file_input, dict, dict);
fclose(fp);
Py_DECREF(dict);
if (!result) {
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
throw SystemExitException();
}
throw PyException();
}
Py_DECREF(result);
if (!fp) {
throw FileException("Unknown file", pxFileName);
}
throw FileException("Unknown file", pxFileName);
PyGILStateLocker locker;
PyObject* module {};
PyObject* dict {};
module = PyImport_AddModule("__main__");
dict = PyModule_GetDict(module);
if (local) {
dict = PyDict_Copy(dict);
}
else {
Py_INCREF(dict); // avoid to further distinguish between local and global dict
}
if (!PyDict_GetItemString(dict, "__file__")) {
PyObject* pyObj = PyUnicode_FromString(pxFileName);
if (!pyObj) {
fclose(fp);
Py_DECREF(dict);
return;
}
if (PyDict_SetItemString(dict, "__file__", pyObj) < 0) {
Py_DECREF(pyObj);
fclose(fp);
Py_DECREF(dict);
return;
}
Py_DECREF(pyObj);
}
PyObject* result = PyRun_File(fp, pxFileName, Py_file_input, dict, dict);
fclose(fp);
Py_DECREF(dict);
if (!result) {
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
throw SystemExitException();
}
throw PyException();
}
Py_DECREF(result);
}
bool InterpreterSingleton::loadModule(const char* psModName)