ide/CodeEditor: Fixes for parsing memory leaks

diff --git a/ide/src/designer/CodeEditor.ec b/ide/src/designer/CodeEditor.ec
index 7b71136..068de9f 100644 (file)
--- a/ide/src/designer/CodeEditor.ec
+++ b/ide/src/designer/CodeEditor.ec
@@ -2447,6 +2447,8 @@ class CodeEditor : Window
       }
       FreeExcludedSymbols(this.excludedSymbols);
       FreeContext(this.globalContext);
+      FreeIncludeFiles();
+      FreeGlobalData(&this.globalData);
 
       if(GetGlobalContext() == globalContext)
       {
@@ -5315,11 +5317,14 @@ class CodeEditor : Window
 
       for(oClass = classes.first; oClass; oClass = oClass.next)
       {
-         ObjectInfo object;
+         if(oClass.instance)
+         {
+            ObjectInfo object;
 
-         sheet.AddObject(oClass, oClass.name ? oClass.name : oClass.instance._class.name, typeClass, false);
-         for(object = oClass.instances.first; object; object = object.next)
-            sheet.AddObject(object, object.name ? object.name : object.instance._class.name, typeData, false);
+            sheet.AddObject(oClass, oClass.name ? oClass.name : oClass.instance._class.name, typeClass, false);
+            for(object = oClass.instances.first; object; object = object.next)
+               sheet.AddObject(object, object.name ? object.name : object.instance._class.name, typeData, false);
+         }
       }
       sheet.SelectObject(selected);
    }
@@ -6706,10 +6711,3 @@ CodeEditor NewCodeEditor(Window parent, WindowState state, bool modified)
    document.Create();
    return document;
 }
-
-void CodeEditor_Terminate()
-{
-   FindParams_Terminate();
-   FindCtx_Terminate();
-   FreeIncludeFiles();
-}

diff --git a/ide/src/designer/Designer.ec b/ide/src/designer/Designer.ec
index 6e1ba4f..c1b9092 100644 (file)
--- a/ide/src/designer/Designer.ec
+++ b/ide/src/designer/Designer.ec
@@ -235,7 +235,7 @@ class Designer : DesignerBase
    {
       ClassDesignerBase classDesigner = this.classDesigner;
 #ifdef _DEBUG
-      if(instance._class.module.application != codeEditor.privateModule)
+      if(instance && instance._class.module.application != codeEditor.privateModule)
          printf("warning: SelectObject: instance._class.module.application != codeEditor.privateModule\n");
 #endif
       if(!classDesigner || !instance || classDesigner._class != (Class)eInstance_GetDesigner(instance))

diff --git a/ide/src/designer/Sheet.ec b/ide/src/designer/Sheet.ec
index 7f51649..b3d0529 100644 (file)
--- a/ide/src/designer/Sheet.ec
+++ b/ide/src/designer/Sheet.ec
@@ -797,7 +797,10 @@ class Sheet : Window
 
                         // Hide properties like this for now..
                         if(name && !strcmp(name, "Private")) 
+                        {
+                           delete info;
                            continue;
+                        }
 
                         if(!category)
                         {