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

Fix various issues:

Browse Source 
+ fix dangling pointers when fetching Python error text
+ initialize members in overloaded constructors of Exception class
+ implement assignment operator in sub-class
+ move to PyCXX API to simplify handling with reference counting and reading values from the dict
This commit is contained in:
wmayer
2017-05-15 18:49:09 +02:00
parent 38e313f0e0
commit 1d8206acbf
5 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Base/Interpreter.cpp
View File

@@ -87,22 +87,21 @@ PyException::~PyException() throw()
void PyException::ThrowException(void)
{
PyException myexcp = PyException();
if(PP_PyDict_Object!=NULL) {
PyObject *pystring;
PyGILStateLocker locker;
if (PP_PyDict_Object!=NULL) {
// delete the Python dict upon destruction of edict
Py::Dict edict(PP_PyDict_Object, true);
PP_PyDict_Object = 0;
pystring = PyDict_GetItemString(PP_PyDict_Object,"sclassname");
if(pystring==NULL)
if (!edict.hasKey("sclassname"))
throw myexcp;
std::string exceptionname = std::string(PyString_AsString(pystring));
if(!Base::ExceptionFactory::Instance().CanProduce(exceptionname.c_str()))
std::string exceptionname = static_cast<std::string>(Py::String(edict.getItem("sclassname")));
if (!Base::ExceptionFactory::Instance().CanProduce(exceptionname.c_str()))
throw myexcp;
Base::ExceptionFactory::Instance().raiseException(PP_PyDict_Object);
Base::ExceptionFactory::Instance().raiseException(edict.ptr());
}
else
throw myexcp;