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

OCC22305 XDE Xml reader does not check the version of xml file

Browse Source
This commit is contained in:
OAN 2011-04-28 15:30:30 +00:00 committed by bugmaster
parent 1bd2fa6705
commit 4fbddc7c38
1 changed files with 122 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
View File

@ -115,11 +115,11 @@ static TCollection_AsciiString AbsolutePath(
while (RelFilePath.Search("../") == 1) { while (RelFilePath.Search("../") == 1) {
if (len == 3) if (len == 3)
return EmptyString ; return EmptyString ;
RelFilePath = RelFilePath.SubString(4,len) ; RelFilePath = RelFilePath.SubString(4,len) ;
len -= 3 ; len -= 3 ;
if (DirPath.IsEmpty()) if (DirPath.IsEmpty())
return EmptyString ; return EmptyString ;
i = DirPath.SearchFromEnd("/") ; i = DirPath.SearchFromEnd("/") ;
if (i < 0) if (i < 0)
return EmptyString ; return EmptyString ;
@ -231,12 +231,27 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument
aCurDocVersion = 2; aCurDocVersion = 2;
else if (!aDocVerStr.GetInteger(aCurDocVersion)) { else if (!aDocVerStr.GetInteger(aCurDocVersion)) {
TCollection_ExtendedString aMsg = TCollection_ExtendedString aMsg =
TCollection_ExtendedString ("Cannot retrieve the current Document version" TCollection_ExtendedString ("Cannot retrieve the current Document version"
" attribute as \"") + aDocVerStr + "\""; " attribute as \"") + aDocVerStr + "\"";
if(!aMsgDriver.IsNull()) if(!aMsgDriver.IsNull())
aMsgDriver->Write(aMsg.ToExtString()); aMsgDriver->Write(aMsg.ToExtString());
} }
if(aCurDocVersion < 2) aCurDocVersion = 2;
// oan: OCC22305 - check a document verison and if it's greater than
// current version of storage driver set an error status and return
if( aCurDocVersion > XmlLDrivers::StorageVersion().IntegerValue() )
{
TCollection_ExtendedString aMsg =
TCollection_ExtendedString ("error: wrong file version: ") +
aDocVerStr + " while current is " +
XmlLDrivers::StorageVersion();
myReaderStatus = PCDM_RS_NoVersion;
if(!aMsgDriver.IsNull())
aMsgDriver->Write(aMsg.ToExtString());
return;
}
if( aCurDocVersion < 2) aCurDocVersion = 2;
PropagateDocumentVersion(aCurDocVersion); PropagateDocumentVersion(aCurDocVersion);
@ -246,111 +261,111 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument
if (aNode.getNodeType() == LDOM_Node::ELEMENT_NODE) { if (aNode.getNodeType() == LDOM_Node::ELEMENT_NODE) {
if (XmlObjMgt::GetExtendedString ((LDOM_Element&)aNode, anInfo)) { if (XmlObjMgt::GetExtendedString ((LDOM_Element&)aNode, anInfo)) {
// Read ref counter // Read ref counter
if(anInfo.Search(REFERENCE_COUNTER) != -1) { if(anInfo.Search(REFERENCE_COUNTER) != -1) {
try { try {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
TCollection_AsciiString anInf(anInfo,'?'); TCollection_AsciiString anInf(anInfo,'?');
Standard_Integer aRefCounter = anInf.Token(" ",2).IntegerValue(); Standard_Integer aRefCounter = anInf.Token(" ",2).IntegerValue();
//theNewDocument->SetReferenceCounter(aRefCounter); //theNewDocument->SetReferenceCounter(aRefCounter);
} }
catch (Standard_Failure) { catch (Standard_Failure) {
// cout << "warning: could not read the reference counter in " << aFileName << endl; // cout << "warning: could not read the reference counter in " << aFileName << endl;
TCollection_ExtendedString aMsg("Warning: "); TCollection_ExtendedString aMsg("Warning: ");
aMsg = aMsg.Cat("could not read the reference counter").Cat("\0"); aMsg = aMsg.Cat("could not read the reference counter").Cat("\0");
if(!aMsgDriver.IsNull()) if(!aMsgDriver.IsNull())
aMsgDriver->Write(aMsg.ToExtString()); aMsgDriver->Write(aMsg.ToExtString());
} }
} }
if(anInfo == END_REF) if(anInfo == END_REF)
isRef = Standard_False; isRef = Standard_False;
if(isRef) { // Process References if(isRef) { // Process References
Standard_Integer pos=anInfo.Search(" "); Standard_Integer pos=anInfo.Search(" ");
if(pos != -1) { if(pos != -1) {
// Parce RefId, DocumentVersion and FileName // Parce RefId, DocumentVersion and FileName
Standard_Integer aRefId; Standard_Integer aRefId;
TCollection_ExtendedString aFileName; TCollection_ExtendedString aFileName;
Standard_Integer aDocumentVersion; Standard_Integer aDocumentVersion;
TCollection_ExtendedString aRest=anInfo.Split(pos); TCollection_ExtendedString aRest=anInfo.Split(pos);
aRefId = UTL::IntegerValue(anInfo); aRefId = UTL::IntegerValue(anInfo);
Standard_Integer pos2 = aRest.Search(" "); Standard_Integer pos2 = aRest.Search(" ");
aFileName = aRest.Split(pos2); aFileName = aRest.Split(pos2);
aDocumentVersion = UTL::IntegerValue(aRest); aDocumentVersion = UTL::IntegerValue(aRest);
TCollection_AsciiString aPath = UTL::CString(aFileName); TCollection_AsciiString aPath = UTL::CString(aFileName);
TCollection_AsciiString anAbsolutePath; TCollection_AsciiString anAbsolutePath;
if(!anAbsoluteDirectory.IsEmpty()) { if(!anAbsoluteDirectory.IsEmpty()) {
anAbsolutePath = AbsolutePath(anAbsoluteDirectory,aPath); anAbsolutePath = AbsolutePath(anAbsoluteDirectory,aPath);
if(!anAbsolutePath.IsEmpty()) aPath=anAbsolutePath; if(!anAbsolutePath.IsEmpty()) aPath=anAbsolutePath;
} }
if(!aMsgDriver.IsNull()) { if(!aMsgDriver.IsNull()) {
// cout << "reference found; ReferenceIdentifier: " << theReferenceIdentifier << "; File:" << thePath << ", version:" << theDocumentVersion; // cout << "reference found; ReferenceIdentifier: " << theReferenceIdentifier << "; File:" << thePath << ", version:" << theDocumentVersion;
TCollection_ExtendedString aMsg("Warning: "); TCollection_ExtendedString aMsg("Warning: ");
aMsg = aMsg.Cat("reference found; ReferenceIdentifier: ").Cat(aRefId).Cat("; File:").Cat(aPath).Cat(", version:").Cat(aDocumentVersion).Cat("\0"); aMsg = aMsg.Cat("reference found; ReferenceIdentifier: ").Cat(aRefId).Cat("; File:").Cat(aPath).Cat(", version:").Cat(aDocumentVersion).Cat("\0");
aMsgDriver->Write(aMsg.ToExtString()); aMsgDriver->Write(aMsg.ToExtString());
} }
// Add new ref! // Add new ref!
///////////// /////////////
TCollection_ExtendedString theFolder,theName; TCollection_ExtendedString theFolder,theName;
//TCollection_ExtendedString theFile=myReferences(myIterator).FileName(); //TCollection_ExtendedString theFile=myReferences(myIterator).FileName();
TCollection_ExtendedString f(aPath); TCollection_ExtendedString f(aPath);
#ifndef WNT #ifndef WNT
Standard_Integer i= f.SearchFromEnd("/"); Standard_Integer i= f.SearchFromEnd("/");
TCollection_ExtendedString n = f.Split(i); TCollection_ExtendedString n = f.Split(i);
f.Trunc(f.Length()-1); f.Trunc(f.Length()-1);
theFolder = f; theFolder = f;
theName = n; theName = n;
#else #else
OSD_Path p = UTL::Path(f); OSD_Path p = UTL::Path(f);
Standard_ExtCharacter chr; Standard_ExtCharacter chr;
TCollection_ExtendedString dir, dirRet, name; TCollection_ExtendedString dir, dirRet, name;
dir = UTL::Disk(p); dir = UTL::Disk(p);
dir += UTL::Trek(p); dir += UTL::Trek(p);
for ( int i = 1; i <= dir.Length (); ++i ) { for ( int i = 1; i <= dir.Length (); ++i ) {
chr = dir.Value ( i ); chr = dir.Value ( i );
switch ( chr ) { switch ( chr ) {
case _TEXT( '|' ): case _TEXT( '|' ):
dirRet += _TEXT( "/" ); dirRet += _TEXT( "/" );
break; break;
case _TEXT( '^' ): case _TEXT( '^' ):
dirRet += _TEXT( ".." ); dirRet += _TEXT( ".." );
break; break;
default: default:
dirRet += chr; dirRet += chr;
} }
} }
theFolder = dirRet; theFolder = dirRet;
theName = UTL::Name(p); theName+= UTL::Extension(p); theName = UTL::Name(p); theName+= UTL::Extension(p);
#endif // WNT #endif // WNT
Handle(CDM_MetaData) aMetaData = CDM_MetaData::LookUp(theFolder,theName,aPath,aPath,UTL::IsReadOnly(aFileName)); Handle(CDM_MetaData) aMetaData = CDM_MetaData::LookUp(theFolder,theName,aPath,aPath,UTL::IsReadOnly(aFileName));
//////////// ////////////
theNewDocument->CreateReference(aMetaData,aRefId, theNewDocument->CreateReference(aMetaData,aRefId,
theApplication,aDocumentVersion,Standard_False); theApplication,aDocumentVersion,Standard_False);
} }
} }
if(anInfo == START_REF) if(anInfo == START_REF)
isRef = Standard_True; isRef = Standard_True;
} }
} }
} }
@ -495,7 +510,7 @@ void XmlLDrivers_DocumentRetrievalDriver::PropagateDocumentVersion(
//======================================================================= //=======================================================================
Handle(XmlMDF_ADriver) XmlLDrivers_DocumentRetrievalDriver::ReadShapeSection( Handle(XmlMDF_ADriver) XmlLDrivers_DocumentRetrievalDriver::ReadShapeSection(
const XmlObjMgt_Element& /*theElement*/, const XmlObjMgt_Element& /*theElement*/,
const Handle(CDM_MessageDriver)& /*aMsgDriver*/) const Handle(CDM_MessageDriver)& /*aMsgDriver*/)
{ {
Handle(XmlMDF_ADriver) aDriver; Handle(XmlMDF_ADriver) aDriver;
//empty; to be redefined //empty; to be redefined
@ -507,5 +522,5 @@ Handle(XmlMDF_ADriver) XmlLDrivers_DocumentRetrievalDriver::ReadShapeSection(
//purpose : definition of ShapeSetCleaning //purpose : definition of ShapeSetCleaning
//======================================================================= //=======================================================================
void XmlLDrivers_DocumentRetrievalDriver::ShapeSetCleaning( void XmlLDrivers_DocumentRetrievalDriver::ShapeSetCleaning(
const Handle(XmlMDF_ADriver)& /*theDriver*/) const Handle(XmlMDF_ADriver)& /*theDriver*/)
{} {}