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

Part: fix crash in Geometry::Restore()

Browse Source 
If a project contains an unknown geometry extension then the attempt to create it returns a null pointer which isn't checked and causes a segmentation fault.

See also forum: https://forum.freecad.org/viewtopic.php?t=81091
This commit is contained in:
wmayer
2023-09-12 17:56:41 +02:00
committed by wwmayer
parent 24cb532182
commit a78ba4b91c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Part/App/Geometry.cpp
View File

@@ -103,6 +103,7 @@
# include <ctime>
#endif //_PreComp_
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
@@ -232,16 +233,21 @@ void Geometry::Restore(Base::XMLReader &reader)
if(strcmp(reader.localName(),"GeoExtensions") == 0) { // new format
int count = reader.getAttributeAsInteger("count");
long count = reader.getAttributeAsInteger("count");
for (int i = 0; i < count; i++) {
for (long i = 0; i < count; i++) {
reader.readElement("GeoExtension");
const char* TypeName = reader.getAttribute("type");
Base::Type type = Base::Type::fromName(TypeName);
GeometryPersistenceExtension *newE = static_cast<GeometryPersistenceExtension *>(type.createInstance());
newE->Restore(reader);
if (newE) {
newE->Restore(reader);
extensions.push_back(std::shared_ptr<GeometryExtension>(newE));
extensions.push_back(std::shared_ptr<GeometryExtension>(newE));
}
else {
Base::Console().Warning("Cannot restore geometry extension of type: %s\n", TypeName);
}
}
reader.readEndElement("GeoExtensions");