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

0029355: OCCT 6.9.1 persistence restored in OCCT 7.2.0 not working

Browse Source 
Auxiliary classes StdObjMgt_ReadData::Object and StdObjMgt_WriteData::Object are renamed to "ObjectSentry" (to better reflect their nature); constructor is made explicit to ensure that such objects are always created intentionally.
These objects are instantiated explicitly in the body of relevant functions, instead of implicit creation as temporary objects when function requires such object as argument.
Variable used to get char from stream is nullified in several places in FSD_File and other classes, to avoid possible usage of uninitialized memory in case if stream is bad.
This commit is contained in:
abv
2017-12-02 11:24:58 +03:00
committed by bugmaster
parent 67160f4e79
commit 472433e2c7
18 changed files with 210 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FSD/FSD_CmpFile.cxx
View File

@@ -325,7 +325,7 @@ void FSD_CmpFile::EndWritePersistentObjectData()
void FSD_CmpFile::ReadPersistentObjectHeader(Standard_Integer& aRef,
Standard_Integer& aType)
{
char c;
char c = '\0';
myStream.get(c);
@@ -388,7 +388,7 @@ void FSD_CmpFile::EndReadObjectData()
void FSD_CmpFile::EndReadPersistentObjectData()
{
char c;
char c = '\0';
myStream.get(c);
while (c != '\n' && (c != '\r')) {

15
src/FSD/FSD_File.cxx
View File

@@ -280,7 +280,7 @@ void FSD_File::ReadExtendedLine(TCollection_ExtendedString& buffer)
void FSD_File::ReadChar(TCollection_AsciiString& buffer, const Standard_Size rsize)
{
char c;
char c = '\0';
Standard_Size ccount = 0;
buffer.Clear();
@@ -1234,7 +1234,7 @@ Storage_Error FSD_File::BeginReadDataSection()
void FSD_File::ReadPersistentObjectHeader(Standard_Integer& aRef,
Standard_Integer& aType)
{
char c;
char c = '\0';
myStream.get(c);
@@ -1277,7 +1277,7 @@ void FSD_File::ReadPersistentObjectHeader(Standard_Integer& aRef,
void FSD_File::BeginReadPersistentObjectData()
{
char c;
char c = '\0';
myStream.get(c);
while (c != '(') {
if (IsEnd() || (c != ' ') || (c == '\n')) {
@@ -1296,8 +1296,7 @@ void FSD_File::BeginReadPersistentObjectData()
void FSD_File::BeginReadObjectData()
{
char c;
char c = '\0';
myStream.get(c);
while (c != '(') {
if (IsEnd() || (c != ' ') || (c == '\n')) {
@@ -1316,8 +1315,7 @@ void FSD_File::BeginReadObjectData()
void FSD_File::EndReadObjectData()
{
char c;
char c = '\0';
myStream.get(c);
while (c != ')') {
if (IsEnd() || (c != ' ') || (c == '\n')) {
@@ -1336,8 +1334,7 @@ void FSD_File::EndReadObjectData()
void FSD_File::EndReadPersistentObjectData()
{
char c;
char c = '\0';
myStream.get(c);
while (c != ')') {