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

App: more sanity check in PropertyContainerPy

Browse Source
This commit is contained in:
Zheng, Lei
2019-08-27 19:37:18 +08:00
committed by wmayer
parent 783d218b1d
commit 31273bc1c6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/App/PropertyContainerPyImp.cpp
View File

@@ -526,11 +526,16 @@ PyObject *PropertyContainerPy::getCustomAttributes(const char* attr) const
if(_getShape != Py_None) {
Py::Tuple args(1);
args.setItem(0,Py::Object(const_cast<PropertyContainerPy*>(this)));
Py::Object res(PyObject_CallObject(_getShape, args.ptr()),true);
if(res.hasAttr("isNull")) {
Py::Callable func(res.getAttr("isNull"));
if(!func.apply().isTrue())
return Py::new_reference_to(res);
auto res = PyObject_CallObject(_getShape, args.ptr());
if(!res)
PyErr_Clear();
else {
Py::Object pyres(res,true);
if(pyres.hasAttr("isNull")) {
Py::Callable func(pyres.getAttr("isNull"));
if(!func.apply().isTrue())
return Py::new_reference_to(res);
}
}
}
}