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

in PropertyLinkList replace assert with C++ exception to avoid a crash

Browse Source
This commit is contained in:
wmayer
2017-08-13 11:04:18 +02:00
parent 282eb82d7f
commit afb0934143
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/App/PropertyLinks.cpp
View File

@@ -24,7 +24,8 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <assert.h>
# include <assert.h>
# include <sstream>
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
@@ -309,7 +310,15 @@ void PropertyLinkList::Restore(Base::XMLReader &reader)
reader.readElement("LinkList");
// get the value of my attribute
int count = reader.getAttributeAsInteger("count");
assert(getContainer()->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId()));
App::PropertyContainer* container = getContainer();
if (!container)
throw Base::RuntimeError("Property is not part of a container");
if (!container->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) {
std::stringstream str;
str << "Container is not a document object ("
<< container->getTypeId().getName() << ")";
throw Base::TypeError(str.str());
}
std::vector<DocumentObject*> values;
values.reserve(count);