0024276: Memory leak due to a static variable

Cleaning of selected entities to avoid a memory leak.

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index 85547fd57c120df747befc6d91db527c1530c817..bc7c438cc8b8e57f3e5911689c0ab24288b1b2bb 100755 (executable)
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -149,6 +149,9 @@ myIsAutoActivateSelMode( Standard_True )
 
 void AIS_InteractiveContext::Delete() const
 {
+  //Clear the static current selection. Else the memory
+  //is not release
+  AIS_Selection::ClearCurrentSelection();
 #ifdef OCC172
   // to avoid an exception
   if ( AIS_Selection::Find( mySelectionName.ToCString() ) )

diff --git a/src/AIS/AIS_Selection.cdl b/src/AIS/AIS_Selection.cdl
index ae5fea78da55b7472ee1c9a6a9e63b2235f3d2f4..4dd866eb2735abebe1b2c3603422acef09a76171 100755 (executable)
--- a/src/AIS/AIS_Selection.cdl
+++ b/src/AIS/AIS_Selection.cdl
@@ -87,6 +87,8 @@ is
     ---Purpose: 
     returns mutable Selection from AIS;
     
+    ClearCurrentSelection(myclass);
+    ---Purpose: Clears selection.
 
     Select(myclass);
     ---Purpose: removes all the object of the currentselection.

diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx
index a9d4b02d19678801f194a8ba5b0db9bb054dbf91..754a6f57fa916ad6f54906505b60ecc952a76183 100755 (executable)
--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -50,9 +50,10 @@
 #define MaxSizeOfResult 100000
 #endif
 
+//current selection (handle)
+static Handle(AIS_Selection) theCurrentSelection;
 static void AIS_Sel_CurrentSelection (Handle(AIS_Selection)& InputSel)     
 {
-  static Handle(AIS_Selection) theCurrentSelection;
   if(!InputSel.IsNull())
     theCurrentSelection = InputSel;
   else
@@ -418,6 +419,11 @@ void AIS_Selection::Remove(const Standard_CString aName)
 #endif
     AIS_Sel_GetSelections().Remove(I);
   }
-  
+}
+
+// clean the static current selection handle
+void AIS_Selection::ClearCurrentSelection()
+{
+    theCurrentSelection.Nullify();
 }
 

diff --git a/src/Visual3d/Visual3d_ViewManager.cxx b/src/Visual3d/Visual3d_ViewManager.cxx
index 6ffaf78fccc18454932f0e0c032062b59ab3bf08..c3f0bfa10d8a1feffee4b14bae39910abfc1cff4 100755 (executable)
--- a/src/Visual3d/Visual3d_ViewManager.cxx
+++ b/src/Visual3d/Visual3d_ViewManager.cxx
@@ -1061,6 +1061,19 @@ Standard_Integer Visual3d_ViewManager::Identification (const Handle(Visual3d_Vie
 
 void Visual3d_ViewManager::UnIdentification (const Standard_Integer aViewId)
 {
+  Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
+  while (MyIterator.More()) 
+  {
+    if ((MyIterator.Value())->Identification () == aViewId)
+    {
+      const Handle(Visual3d_View)& theView = MyIterator.Value();
+      //remove the view from the list
+      MyDefinedView.Remove(theView);
+      break;
+    }
+    // go to next
+    MyIterator.Next ();
+  }
   MyViewGenId.Free(aViewId);
 }