OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0033855: Data Exchange - XCAFDoc_ShapeTool::GetShape() throws Standard_NullObject exception after partial read of XBF document

Browse Source 
Resolve missed references until all are resolved to produce expected result without exceptions.
This commit is contained in:
oan 2024-12-11 12:59:40 +00:00
parent d5afabec90
commit de18daf279
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
View File

@ -37,6 +37,7 @@
#include <TDF_Attribute.hxx> #include <TDF_Attribute.hxx>
#include <TDF_Data.hxx> #include <TDF_Data.hxx>
#include <TDF_Label.hxx> #include <TDF_Label.hxx>
#include <TDF_Tool.hxx>
#include <TDocStd_Document.hxx> #include <TDocStd_Document.hxx>
#include <TDocStd_FormatVersion.hxx> #include <TDocStd_FormatVersion.hxx>
#include <TDocStd_Owner.hxx> #include <TDocStd_Owner.hxx>
@ -322,13 +323,22 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
myPAtt.SetIStream (theIStream); // for reading shapes data from the stream directly myPAtt.SetIStream (theIStream); // for reading shapes data from the stream directly
EnableQuickPartReading (myMsgDriver, aQuickPart); EnableQuickPartReading (myMsgDriver, aQuickPart);
myResolvedLinks.Clear();
myUnresolvedLinks.Clear();
// read sub-tree of the root label // read sub-tree of the root label
if (!theFilter.IsNull()) if (!theFilter.IsNull())
theFilter->StartIteration(); theFilter->StartIteration();
const auto aStreamStartPosition = theIStream.tellg(); const auto aStreamStartPosition = theIStream.tellg();
Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next()); Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next());
if (!myUnresolvedLinks.IsEmpty()) while (!myUnresolvedLinks.IsEmpty())
{ {
if (!aPS.More())
{
myReaderStatus = PCDM_RS_UserBreak;
return;
}
// In case we have skipped some linked TreeNodes before getting to // In case we have skipped some linked TreeNodes before getting to
// their children. // their children.
theFilter->StartIteration(); theFilter->StartIteration();
@ -497,10 +507,17 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
theLabel.AddAttribute(tAtt); theLabel.AddAttribute(tAtt);
} }
} }
else else if (theLabel != tAtt->Label())
{
TCollection_AsciiString aLabelEntry1, aLabelEntry2;
TDF_Tool::Entry (tAtt->Label(), aLabelEntry1);
TDF_Tool::Entry (theLabel, aLabelEntry2);
myMsgDriver->Send(aMethStr + myMsgDriver->Send(aMethStr +
"warning: attempt to attach attribute " + "warning: attempt to attach attribute " +
aDriver->TypeName() + " to a second label", Message_Warning); aDriver->TypeName() + " to a second label " + "(" +
aLabelEntry1 + " => " + aLabelEntry2 + ")", Message_Warning);
}
Standard_Boolean ok = aDriver->Paste(myPAtt, tAtt, myRelocTable); Standard_Boolean ok = aDriver->Paste(myPAtt, tAtt, myRelocTable);
if (!ok) { if (!ok) {
@ -511,12 +528,16 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
else if (!isBound) else if (!isBound)
{ {
myRelocTable.Bind(anID, tAtt); myRelocTable.Bind(anID, tAtt);
Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt); }
if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt);
if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
{
Standard_Integer anUnresolvedLink;
myPAtt.SetPosition(BP_HEADSIZE);
myPAtt >> anUnresolvedLink;
if (myResolvedLinks.Add (myPAtt.Id()))
{ {
Standard_Integer anUnresolvedLink;
myPAtt.SetPosition(BP_HEADSIZE);
myPAtt >> anUnresolvedLink;
myUnresolvedLinks.Add(anUnresolvedLink); myUnresolvedLinks.Add(anUnresolvedLink);
} }
} }
@ -650,6 +671,7 @@ void BinLDrivers_DocumentRetrievalDriver::Clear()
myPAtt.Destroy(); // free buffer myPAtt.Destroy(); // free buffer
myRelocTable.Clear(); myRelocTable.Clear();
myMapUnsupported.Clear(); myMapUnsupported.Clear();
myResolvedLinks.Clear();
} }
//======================================================================= //=======================================================================

2
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
View File

@ -127,7 +127,7 @@ private:
TColStd_MapOfInteger myMapUnsupported; TColStd_MapOfInteger myMapUnsupported;
BinLDrivers_VectorOfDocumentSection mySections; BinLDrivers_VectorOfDocumentSection mySections;
NCollection_Map<Standard_Integer> myUnresolvedLinks; NCollection_Map<Standard_Integer> myUnresolvedLinks;
NCollection_Map<Standard_Integer> myResolvedLinks;
}; };