Resolved nullptr bug in lod32 attribute fetching

Author: jaspervdv

inc/cjCreator.cpp

@@ -3198,7 +3198,6 @@ std::vector< CJT::GeoObject>CJGeoCreator::makeLoD32(DataManager* h, CJT::Kernel*
 		const  IfcSchema::IfcProduct* product = currentFacePair.second;
 		std::string productType = product->data().type()->name();
 		const TopoDS_Face& currentFace = currentFacePair.first;
-
 		builder.Add(collectionShape, currentFace);
 
 		if (productType == "IfcPlate") //TODO: make this smarter
@@ -3230,7 +3229,6 @@ std::vector< CJT::GeoObject>CJGeoCreator::makeLoD32(DataManager* h, CJT::Kernel*
 				objectMap[CJObjectEnum::getString(CJObjectID::ifcName)] = product->Name().get();
 			}
 			objectMap[CJObjectEnum::getString(CJObjectID::ifcGuid)] = product->GlobalId();
-
 			if (productType == "IfcWindow")
 			{
 				objectMap[CJObjectEnum::getString(CJObjectID::CJType)] = CJObjectEnum::getString(CJObjectID::CJTypeWindow);
@@ -3240,8 +3238,8 @@ std::vector< CJT::GeoObject>CJGeoCreator::makeLoD32(DataManager* h, CJT::Kernel*
 				objectMap[CJObjectEnum::getString(CJObjectID::CJType)] = CJObjectEnum::getString(CJObjectID::CJTypeDoor);
 			}
 
-
 			std::vector<nlohmann::json> attributeList = helperFunctions::collectPropertyValues(product->GlobalId(), h->getSourceFile(0));
+
 			for (nlohmann::json attributeObject : attributeList)
 			{
 				for (auto jsonObIt = attributeObject.begin(); jsonObIt != attributeObject.end(); ++jsonObIt) {

inc/helper.cpp

@@ -2282,8 +2282,6 @@ std::vector<nlohmann::json> helperFunctions::collectPropertyValues(std::string o
 #else
 		IfcSchema::IfcObject::list::ptr relatedObjectList = relDefItem->RelatedObjects();
 #endif
-
-
 		bool match = false;
 		for (auto objectIt = relatedObjectList->begin(); objectIt != relatedObjectList->end(); objectIt++)
 		{
@@ -2297,15 +2295,18 @@ std::vector<nlohmann::json> helperFunctions::collectPropertyValues(std::string o
 #else
 		IfcSchema::IfcPropertySetDefinition* propertyDef = relDefItem->RelatingPropertyDefinition();
 #endif
+		if (propertyDef == nullptr) { continue; }
 
 		if (propertyDef->data().type()->name() != "IfcPropertySet") { continue; }
 		IfcSchema::IfcPropertySet* propertySet = relDefItem->RelatingPropertyDefinition()->as<IfcSchema::IfcPropertySet>();
 		IfcSchema::IfcProperty::list::ptr propertyList = propertySet->HasProperties();
 		for (auto propertyIt = propertyList->begin(); propertyIt != propertyList->end(); propertyIt++)
 		{
+			if (*propertyIt == nullptr) { continue; }
 			IfcSchema::IfcPropertySingleValue* propertyItem = (*propertyIt)->as<IfcSchema::IfcPropertySingleValue>();
 
 			IfcSchema::IfcValue* ifcValue = propertyItem->NominalValue();
+			if (ifcValue == nullptr) { continue; }
 
 			std::string propertyIdName = ifcValue->data().type()->name();
 

inc/helper.h

@@ -1,4 +1,4 @@
-#define USE_IFC2x3
+#define USE_IFC4
 
 #ifdef USE_IFC2x3
 #define IfcSchema Ifc2x3