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

0022232: [CEA 837] Memory corruption in GEOM/SMESH that leads to segfault on debian64

Browse Source 
Fix "Mismatched free() / delete / delete []" valgrind error

-  Standard_EXPORT char* GetName();
+  Standard_EXPORT TCollection_AsciiString GetName();
This commit is contained in:
eap 2013-06-19 14:23:50 +00:00
parent e69511781d
commit 1d2e9cb443
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOM/GEOM_Object.cxx
View File

@ -314,16 +314,16 @@ void GEOM_Object::SetName(const char* theName)
* GetName * GetName
*/ */
//============================================================================= //=============================================================================
char* GEOM_Object::GetName() TCollection_AsciiString GEOM_Object::GetName()
{ {
TCollection_AsciiString aName;
Handle(TDataStd_Name) aNameAttr; Handle(TDataStd_Name) aNameAttr;
if(!_label.FindAttribute(TDataStd_Name::GetID(), aNameAttr)) return NULL; if(_label.FindAttribute(TDataStd_Name::GetID(), aNameAttr))
aName = aNameAttr->Get();
TCollection_AsciiString aName(aNameAttr->Get());
// do not return pointer of local variable // do not return pointer of local variable
// return aName.ToCString(); // return aName.ToCString();
// the following code could lead to memory leak, so take care about recieved pointer // the following code could lead to memory leak, so take care about recieved pointer
return strdup(aName.ToCString()); return aName;
} }
//============================================================================= //=============================================================================

2
src/GEOM/GEOM_Object.hxx
View File

@ -213,7 +213,7 @@ class GEOM_Object : public MMgt_TShared
Standard_EXPORT void SetName(const char* theName); Standard_EXPORT void SetName(const char* theName);
//Returns a name of this GEOM_Object //Returns a name of this GEOM_Object
Standard_EXPORT char* GetName(); Standard_EXPORT TCollection_AsciiString GetName();
//Sets a color of this GEOM_Object //Sets a color of this GEOM_Object
Standard_EXPORT void SetColor(const Color& theColor); Standard_EXPORT void SetColor(const Color& theColor);