OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0031546: Application Framework - Memory leak (100 bytes) on Load / Close OCAF document

Browse Source 
Class Standard_BaseDriver is inherited from Standard_Transient, its descendants are updated accordingly.
Handle is used to manipulate objects of this class and its descendants (instead of references or raw pointers) to ensure automatic destruction.

Added test bugs caf bug31546

Related:
- Standard_OVERRIDE is added in declarations of virtual methods in descendants of Storage_BaseDriver
- Methods operator << and operator >> are removed in descendants of Storage_BaseDriver (they repeat the same methods inherited from the base class)
- Typedef PCDM_BaseDriverPointer is marked as deprecated
- Unused class DDI_Ostream is removed
- Private field Standard_Transient::count is renamed to myRefCount_ to avoid compiler warnings if the same name is used within the scope of a descendant class
- Output of meaningful error messages is restored in DRAW commands fsdread and fsdwrite
This commit is contained in:
abv
2020-05-04 22:25:03 +03:00
committed by bugmaster
parent dcc4e908c2
commit 39c8dc708f
54 changed files with 664 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
src/FSD/FSD_File.hxx
View File

@@ -17,25 +17,9 @@
#ifndef _FSD_File_HeaderFile
#define _FSD_File_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <FSD_FStream.hxx>
#include <Storage_BaseDriver.hxx>
#include <Storage_Error.hxx>
#include <Storage_OpenMode.hxx>
#include <Standard_Boolean.hxx>
#include <Storage_Position.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
#include <TColStd_SequenceOfExtendedString.hxx>
#include <Standard_Character.hxx>
#include <Standard_ExtCharacter.hxx>
#include <Standard_Real.hxx>
#include <Standard_ShortReal.hxx>
#include <Standard_Size.hxx>
#include <Standard_CString.hxx>
class Storage_StreamTypeMismatchError;
class Storage_StreamFormatError;
class Storage_StreamWriteError;
@@ -44,17 +28,16 @@ class TCollection_AsciiString;
class TCollection_ExtendedString;
class Storage_BaseDriver;
DEFINE_STANDARD_HANDLE(FSD_File,Storage_BaseDriver)
//! A general driver which defines as a file, the
//! physical container for data to be stored or retrieved.
class FSD_File : public Storage_BaseDriver
{
public:
DEFINE_STANDARD_RTTIEXT(FSD_File,Storage_BaseDriver)
DEFINE_STANDARD_ALLOC
public:
//! Constructs a driver defining as a file, the physical
//! container for data to be stored or retrieved.
@@ -68,203 +51,174 @@ public:
//! The function returns Storage_VSOk if the file
//! is opened correctly, or any other value of the
//! Storage_Error enumeration which specifies the problem encountered.
Standard_EXPORT virtual Storage_Error Open (const TCollection_AsciiString& aName, const Storage_OpenMode aMode);
Standard_EXPORT virtual Storage_Error Open (const TCollection_AsciiString& aName, const Storage_OpenMode aMode) Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Boolean IsEnd();
Standard_EXPORT virtual Standard_Boolean IsEnd() Standard_OVERRIDE;
//! return position in the file. Return -1 upon error.
Standard_EXPORT virtual Storage_Position Tell();
Standard_EXPORT virtual Storage_Position Tell() Standard_OVERRIDE;
Standard_EXPORT static Storage_Error IsGoodFileType (const TCollection_AsciiString& aName);
Standard_EXPORT virtual Storage_Error BeginWriteInfoSection();
Standard_EXPORT virtual Storage_Error BeginWriteInfoSection() Standard_OVERRIDE;
Standard_EXPORT virtual void WriteInfo (const Standard_Integer nbObj, const TCollection_AsciiString& dbVersion, const TCollection_AsciiString& date, const TCollection_AsciiString& schemaName, const TCollection_AsciiString& schemaVersion, const TCollection_ExtendedString& appName, const TCollection_AsciiString& appVersion, const TCollection_ExtendedString& objectType, const TColStd_SequenceOfAsciiString& userInfo);
Standard_EXPORT virtual void WriteInfo (const Standard_Integer nbObj,
const TCollection_AsciiString& dbVersion,
const TCollection_AsciiString& date,
const TCollection_AsciiString& schemaName,
const TCollection_AsciiString& schemaVersion,
const TCollection_ExtendedString& appName,
const TCollection_AsciiString& appVersion,
const TCollection_ExtendedString& objectType,
const TColStd_SequenceOfAsciiString& userInfo) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteInfoSection();
Standard_EXPORT virtual Storage_Error EndWriteInfoSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadInfoSection();
Standard_EXPORT virtual Storage_Error BeginReadInfoSection() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadInfo (Standard_Integer& nbObj, TCollection_AsciiString& dbVersion, TCollection_AsciiString& date, TCollection_AsciiString& schemaName, TCollection_AsciiString& schemaVersion, TCollection_ExtendedString& appName, TCollection_AsciiString& appVersion, TCollection_ExtendedString& objectType, TColStd_SequenceOfAsciiString& userInfo);
Standard_EXPORT virtual void ReadInfo (Standard_Integer& nbObj,
TCollection_AsciiString& dbVersion,
TCollection_AsciiString& date,
TCollection_AsciiString& schemaName,
TCollection_AsciiString& schemaVersion,
TCollection_ExtendedString& appName,
TCollection_AsciiString& appVersion,
TCollection_ExtendedString& objectType,
TColStd_SequenceOfAsciiString& userInfo) Standard_OVERRIDE;
Standard_EXPORT virtual void ReadCompleteInfo (Standard_IStream& theIStream, Handle(Storage_Data)& theData);
Standard_EXPORT virtual void ReadCompleteInfo (Standard_IStream& theIStream, Handle(Storage_Data)& theData) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadInfoSection();
Standard_EXPORT virtual Storage_Error EndReadInfoSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginWriteCommentSection();
Standard_EXPORT virtual Storage_Error BeginWriteCommentSection() Standard_OVERRIDE;
Standard_EXPORT virtual void WriteComment (const TColStd_SequenceOfExtendedString& userComments);
Standard_EXPORT virtual void WriteComment (const TColStd_SequenceOfExtendedString& userComments) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteCommentSection();
Standard_EXPORT virtual Storage_Error EndWriteCommentSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadCommentSection();
Standard_EXPORT virtual Storage_Error BeginReadCommentSection() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadComment (TColStd_SequenceOfExtendedString& userComments);
Standard_EXPORT virtual void ReadComment (TColStd_SequenceOfExtendedString& userComments) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadCommentSection();
Standard_EXPORT virtual Storage_Error EndReadCommentSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginWriteTypeSection();
Standard_EXPORT virtual Storage_Error BeginWriteTypeSection() Standard_OVERRIDE;
Standard_EXPORT virtual void SetTypeSectionSize (const Standard_Integer aSize);
Standard_EXPORT virtual void SetTypeSectionSize (const Standard_Integer aSize) Standard_OVERRIDE;
Standard_EXPORT virtual void WriteTypeInformations (const Standard_Integer typeNum, const TCollection_AsciiString& typeName);
Standard_EXPORT virtual void WriteTypeInformations (const Standard_Integer typeNum,
const TCollection_AsciiString& typeName) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteTypeSection();
Standard_EXPORT virtual Storage_Error EndWriteTypeSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadTypeSection();
Standard_EXPORT virtual Storage_Error BeginReadTypeSection() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer TypeSectionSize();
Standard_EXPORT virtual Standard_Integer TypeSectionSize() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadTypeInformations (Standard_Integer& typeNum, TCollection_AsciiString& typeName);
Standard_EXPORT virtual void ReadTypeInformations (Standard_Integer& typeNum, TCollection_AsciiString& typeName) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadTypeSection();
Standard_EXPORT virtual Storage_Error EndReadTypeSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginWriteRootSection();
Standard_EXPORT virtual Storage_Error BeginWriteRootSection() Standard_OVERRIDE;
Standard_EXPORT virtual void SetRootSectionSize (const Standard_Integer aSize);
Standard_EXPORT virtual void SetRootSectionSize (const Standard_Integer aSize) Standard_OVERRIDE;
Standard_EXPORT virtual void WriteRoot (const TCollection_AsciiString& rootName, const Standard_Integer aRef, const TCollection_AsciiString& aType);
Standard_EXPORT virtual void WriteRoot (const TCollection_AsciiString& rootName,
const Standard_Integer aRef,
const TCollection_AsciiString& aType) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteRootSection();
Standard_EXPORT virtual Storage_Error EndWriteRootSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadRootSection();
Standard_EXPORT virtual Storage_Error BeginReadRootSection() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer RootSectionSize();
Standard_EXPORT virtual Standard_Integer RootSectionSize() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadRoot (TCollection_AsciiString& rootName, Standard_Integer& aRef, TCollection_AsciiString& aType);
Standard_EXPORT virtual void ReadRoot (TCollection_AsciiString& rootName,
Standard_Integer& aRef,
TCollection_AsciiString& aType) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadRootSection();
Standard_EXPORT virtual Storage_Error EndReadRootSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginWriteRefSection();
Standard_EXPORT virtual Storage_Error BeginWriteRefSection() Standard_OVERRIDE;
Standard_EXPORT virtual void SetRefSectionSize (const Standard_Integer aSize);
Standard_EXPORT virtual void SetRefSectionSize (const Standard_Integer aSize) Standard_OVERRIDE;
Standard_EXPORT virtual void WriteReferenceType (const Standard_Integer reference, const Standard_Integer typeNum);
Standard_EXPORT virtual void WriteReferenceType (const Standard_Integer reference, const Standard_Integer typeNum) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteRefSection();
Standard_EXPORT virtual Storage_Error EndWriteRefSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadRefSection();
Standard_EXPORT virtual Storage_Error BeginReadRefSection() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Integer RefSectionSize();
Standard_EXPORT virtual Standard_Integer RefSectionSize() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadReferenceType (Standard_Integer& reference, Standard_Integer& typeNum);
Standard_EXPORT virtual void ReadReferenceType (Standard_Integer& reference, Standard_Integer& typeNum) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadRefSection();
Standard_EXPORT virtual Storage_Error EndReadRefSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginWriteDataSection();
Standard_EXPORT virtual Storage_Error BeginWriteDataSection() Standard_OVERRIDE;
Standard_EXPORT virtual void WritePersistentObjectHeader (const Standard_Integer aRef, const Standard_Integer aType);
Standard_EXPORT virtual void WritePersistentObjectHeader (const Standard_Integer aRef, const Standard_Integer aType) Standard_OVERRIDE;
Standard_EXPORT virtual void BeginWritePersistentObjectData();
Standard_EXPORT virtual void BeginWritePersistentObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void BeginWriteObjectData();
Standard_EXPORT virtual void BeginWriteObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void EndWriteObjectData();
Standard_EXPORT virtual void EndWriteObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void EndWritePersistentObjectData();
Standard_EXPORT virtual void EndWritePersistentObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndWriteDataSection();
Standard_EXPORT virtual Storage_Error EndWriteDataSection() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error BeginReadDataSection();
Standard_EXPORT virtual Storage_Error BeginReadDataSection() Standard_OVERRIDE;
Standard_EXPORT virtual void ReadPersistentObjectHeader (Standard_Integer& aRef, Standard_Integer& aType);
Standard_EXPORT virtual void ReadPersistentObjectHeader (Standard_Integer& aRef, Standard_Integer& aType) Standard_OVERRIDE;
Standard_EXPORT virtual void BeginReadPersistentObjectData();
Standard_EXPORT virtual void BeginReadPersistentObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void BeginReadObjectData();
Standard_EXPORT virtual void BeginReadObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void EndReadObjectData();
Standard_EXPORT virtual void EndReadObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual void EndReadPersistentObjectData();
Standard_EXPORT virtual void EndReadPersistentObjectData() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_Error EndReadDataSection();
Standard_EXPORT virtual Storage_Error EndReadDataSection() Standard_OVERRIDE;
Standard_EXPORT virtual void SkipObject();
Standard_EXPORT virtual void SkipObject() Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutReference (const Standard_Integer aValue);
Standard_EXPORT virtual Storage_BaseDriver& PutReference (const Standard_Integer aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutCharacter (const Standard_Character aValue);
Standard_EXPORT virtual Storage_BaseDriver& PutCharacter (const Standard_Character aValue) Standard_OVERRIDE;
Storage_BaseDriver& operator << (const Standard_Character aValue)
{
return PutCharacter(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& PutExtCharacter(const Standard_ExtCharacter aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutExtCharacter (const Standard_ExtCharacter aValue);
Storage_BaseDriver& operator << (const Standard_ExtCharacter aValue)
{
return PutExtCharacter(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& PutInteger (const Standard_Integer aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutInteger (const Standard_Integer aValue);
Storage_BaseDriver& operator << (const Standard_Integer aValue)
{
return PutInteger(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& PutBoolean (const Standard_Boolean aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutBoolean (const Standard_Boolean aValue);
Storage_BaseDriver& operator << (const Standard_Boolean aValue)
{
return PutBoolean(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& PutReal (const Standard_Real aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutReal (const Standard_Real aValue);
Storage_BaseDriver& operator << (const Standard_Real aValue)
{
return PutReal(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& PutShortReal (const Standard_ShortReal aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& PutShortReal (const Standard_ShortReal aValue);
Storage_BaseDriver& operator << (const Standard_ShortReal aValue)
{
return PutShortReal(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetReference (Standard_Integer& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetReference (Standard_Integer& aValue);
Standard_EXPORT virtual Storage_BaseDriver& GetCharacter (Standard_Character& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetCharacter (Standard_Character& aValue);
Storage_BaseDriver& operator >> (Standard_Character& aValue)
{
return GetCharacter(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetExtCharacter (Standard_ExtCharacter& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetExtCharacter (Standard_ExtCharacter& aValue);
Storage_BaseDriver& operator >> (Standard_ExtCharacter& aValue)
{
return GetExtCharacter(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetInteger (Standard_Integer& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetInteger (Standard_Integer& aValue);
Storage_BaseDriver& operator >> (Standard_Integer& aValue)
{
return GetInteger(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetBoolean (Standard_Boolean& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetBoolean (Standard_Boolean& aValue);
Storage_BaseDriver& operator >> (Standard_Boolean& aValue)
{
return GetBoolean(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetReal (Standard_Real& aValue);
Storage_BaseDriver& operator >> (Standard_Real& aValue)
{
return GetReal(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetShortReal (Standard_ShortReal& aValue);
Storage_BaseDriver& operator >> (Standard_ShortReal& aValue)
{
return GetShortReal(aValue);
}
Standard_EXPORT virtual Storage_BaseDriver& GetReal (Standard_Real& aValue) Standard_OVERRIDE;
Standard_EXPORT virtual Storage_BaseDriver& GetShortReal (Standard_ShortReal& aValue) Standard_OVERRIDE;
//! Closes the file driven by this driver. This file was
//! opened by the last call to the function Open.
//! The function returns Storage_VSOk if the
//! closure is correctly done, or any other value of
//! the Storage_Error enumeration which specifies the problem encountered.
Standard_EXPORT virtual Storage_Error Close();
Standard_EXPORT virtual Storage_Error Close() Standard_OVERRIDE;
Standard_EXPORT void Destroy();
~FSD_File()
@@ -274,9 +228,7 @@ public:
Standard_EXPORT static Standard_CString MagicNumber();
protected:
protected:
//! read from the current position to the end of line.
Standard_EXPORT virtual void ReadLine (TCollection_AsciiString& buffer);
@@ -300,7 +252,7 @@ public:
Standard_EXPORT virtual Storage_Error FindTag (const Standard_CString aTag);
protected:
FSD_FStream myStream;
};