OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

AppFwk : Guard for null pointer access

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-17 11:45:05 +02:00
parent eb31e9672f
commit 60b4078829
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp
View File

@@ -165,6 +165,8 @@ PdmObjectHandle* PdmXmlObjectHandle::readUnknownObjectFromXmlString(const QStrin
QString classKeyword = inputStream.name().toString();
PdmObjectHandle* newObject = objectFactory->create(classKeyword);
if (!newObject) return nullptr;
xmlObj(newObject)->readFields(inputStream, objectFactory);
return newObject;
@@ -180,6 +182,8 @@ PdmObjectHandle* PdmXmlObjectHandle::copyByXmlSerialization(PdmObjectFactory* ob
QString xmlString = this->writeObjectToXmlString();
PdmObjectHandle* objectCopy = PdmXmlObjectHandle::readUnknownObjectFromXmlString(xmlString, objectFactory);
if (!objectCopy) return nullptr;
objectCopy->xmlCapability()->initAfterReadRecursively();
return objectCopy;
@@ -195,6 +199,8 @@ caf::PdmObjectHandle* PdmXmlObjectHandle::copyAndCastByXmlSerialization(const QS
QString xmlString = this->writeObjectToXmlString();
PdmObjectHandle* upgradedObject = objectFactory->create(destinationClassKeyword);
if (!upgradedObject) return nullptr;
QXmlStreamReader inputStream(xmlString);
QXmlStreamReader::TokenType tt;