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

Gui: Prevent crash when trying to access sub-objects of a deleted object from a SelectionObject

Browse Source
This commit is contained in:
marioalexis
2021-01-09 11:52:51 -03:00
committed by abdullahtahiriyo
parent afd1470202
commit 00822b0a80
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/SelectionObjectPyImp.cpp
View File

@@ -116,18 +116,23 @@ Py::Object SelectionObjectPy::getObject(void) const
Py::Tuple SelectionObjectPy::getSubObjects(void) const
{
std::vector<PyObject *> objs;
App::DocumentObject *obj = getSelectionObjectPtr()->getObject();
if (!obj)
throw Py::RuntimeError("Cannot get sub-objects of deleted object");
std::vector<PyObject *> subObjs;
for(const auto &subname : getSelectionObjectPtr()->getSubNames()) {
PyObject *pyObj=0;
Base::Matrix4D mat;
getSelectionObjectPtr()->getObject()->getSubObject(subname.c_str(),&pyObj,&mat);
if(pyObj) objs.push_back(pyObj);
obj->getSubObject(subname.c_str(),&pyObj,&mat);
if(pyObj)
subObjs.push_back(pyObj);
}
Py::Tuple temp(objs.size());
Py::Tuple temp(subObjs.size());
Py::sequence_index_type index = 0;
for(std::vector<PyObject *>::const_iterator it= objs.begin();it!=objs.end();++it)
for(std::vector<PyObject *>::const_iterator it= subObjs.begin();it!=subObjs.end();++it)
temp.setItem(index++, Py::asObject(*it));
return temp;