suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix crash when raising SystemExitException if not called inside Python function

Browse Source
This commit is contained in:
wmayer 2016-03-21 18:50:57 +01:00
parent feac22b00d
commit 7df94ca9af
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Base/Interpreter.cpp
View File

@ -105,22 +105,25 @@ SystemExitException::SystemExitException()
std::string errMsg = "System exit";
PyObject *type, *value, *traceback, *code;
PyGILStateLocker locker;
PyErr_Fetch(&type, &value, &traceback);
PyErr_NormalizeException(&type, &value, &traceback);
code = PyObject_GetAttrString(value, "code");
if (code != NULL && value != Py_None) {
Py_DECREF(value);
value = code;
}
if (value) {
code = PyObject_GetAttrString(value, "code");
if (code != NULL && value != Py_None) {
Py_DECREF(value);
value = code;
}
if (PyInt_Check(value)) {
errCode = PyInt_AsLong(value);
}
else {
const char *str = PyString_AsString(value);
if (str)
errMsg = errMsg + ": " + str;
if (PyInt_Check(value)) {
errCode = PyInt_AsLong(value);
}
else {
const char *str = PyString_AsString(value);
if (str)
errMsg = errMsg + ": " + str;
}
}
_sErrMsg = errMsg;
@ -128,7 +131,7 @@ SystemExitException::SystemExitException()
}
SystemExitException::SystemExitException(const SystemExitException &inst)
: Exception(inst)
: Exception(inst)
{
}