ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 18:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL10195: SALOME V2 study with a mesh leads to SIGSEGV of SALOME V3

Browse Source
This commit is contained in:
jfa 2005-10-10 10:00:24 +00:00
parent 6cbd23c4f4
commit 90699a9eec
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -1739,7 +1739,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
char* hypname_str = new char[ size ]; char* hypname_str = new char[ size ];
aDataset->ReadFromDisk( hypname_str ); aDataset->ReadFromDisk( hypname_str );
hypname = string( hypname_str ); hypname = string( hypname_str );
delete hypname_str; delete [] hypname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
// --> get hypothesis plugin library name // --> get hypothesis plugin library name
@ -1751,7 +1751,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
aDataset->ReadFromDisk( libname_str ); aDataset->ReadFromDisk( libname_str );
if(MYDEBUG) SCRUTE( libname_str ); if(MYDEBUG) SCRUTE( libname_str );
libname = string( libname_str ); libname = string( libname_str );
delete libname_str; delete [] libname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
// --> get hypothesis data // --> get hypothesis data
@ -1762,7 +1762,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
char* hypdata_str = new char[ size ]; char* hypdata_str = new char[ size ];
aDataset->ReadFromDisk( hypdata_str ); aDataset->ReadFromDisk( hypdata_str );
hypdata = string( hypdata_str ); hypdata = string( hypdata_str );
delete hypdata_str; delete [] hypdata_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
} }
@ -1836,7 +1836,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
char* hypname_str = new char[ size ]; char* hypname_str = new char[ size ];
aDataset->ReadFromDisk( hypname_str ); aDataset->ReadFromDisk( hypname_str );
hypname = string( hypname_str ); hypname = string( hypname_str );
delete hypname_str; delete [] hypname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
// --> get algorithm plugin library name // --> get algorithm plugin library name
@ -1848,7 +1848,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
aDataset->ReadFromDisk( libname_str ); aDataset->ReadFromDisk( libname_str );
if(MYDEBUG) SCRUTE( libname_str ); if(MYDEBUG) SCRUTE( libname_str );
libname = string( libname_str ); libname = string( libname_str );
delete libname_str; delete [] libname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
// --> get algorithm data // --> get algorithm data
@ -1860,7 +1860,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
aDataset->ReadFromDisk( hypdata_str ); aDataset->ReadFromDisk( hypdata_str );
if(MYDEBUG) SCRUTE( hypdata_str ); if(MYDEBUG) SCRUTE( hypdata_str );
hypdata = string( hypdata_str ); hypdata = string( hypdata_str );
delete hypdata_str; delete [] hypdata_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
} }
} }
@ -2272,7 +2272,10 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
} }
else // NODE IDS else // NODE IDS
{ {
int aSize = aDataset->GetSize()/sizeof(int); //PAL10195:int aSize = aDataset->GetSize()/sizeof(int);
int aSize = aDataset->GetSize(); //PAL10195
if (aDataset->GetType() == HDF_STRING) //PAL10195
aSize /= sizeof(int); //PAL10195
int* ids = new int [aSize]; int* ids = new int [aSize];
aDataset->ReadFromDisk( ids ); aDataset->ReadFromDisk( ids );
// on face or nodes? // on face or nodes?