ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Some protection from usage of removed objects whose data label

Browse Source 
is reused by a new object
This commit is contained in:
eap 2013-10-04 14:25:30 +00:00
parent 6ca2a7408c
commit 4e2d22a173
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/GEOM/GEOM_Engine.cxx
View File

@ -462,7 +462,12 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_BaseObject)& theObject)
//Remove an object from the map of available objects //Remove an object from the map of available objects
TCollection_AsciiString anID = BuildIDFromObject(theObject); TCollection_AsciiString anID = BuildIDFromObject(theObject);
if (_objects.IsBound(anID)) _objects.UnBind(anID); if (_objects.IsBound(anID)) {
Handle(GEOM_BaseObject) anObject = Handle(GEOM_BaseObject)::DownCast(_objects(anID));
if ( anObject != theObject )
anObject->_label = anObject->_label.Root();
_objects.UnBind(anID);
}
// If sub-shape, remove it from the list of sub-shapes of its main shape // If sub-shape, remove it from the list of sub-shapes of its main shape
Handle(GEOM_Object) aGO = Handle(GEOM_Object)::DownCast( theObject ); Handle(GEOM_Object) aGO = Handle(GEOM_Object)::DownCast( theObject );
@ -491,6 +496,13 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_BaseObject)& theObject)
if ( aFreeLabels.empty() || aFreeLabels.back() != aLabel ) if ( aFreeLabels.empty() || aFreeLabels.back() != aLabel )
aFreeLabels.push_back(aLabel); aFreeLabels.push_back(aLabel);
// we can't explicitely delete theObject. At least prevent its functioning
// as an alive object when aLabel is reused for a new object
theObject->_label = aLabel.Root();
theObject->_ior.Clear();
theObject->_parameters.Clear();
theObject->_docID = -1;
theObject.Nullify(); theObject.Nullify();
return true; return true;