ecere/com/containers; samples/gui/OpenRider: Fixed memory leaks

- structs were leaking on deserialization

diff --git a/compiler/bootstrap/ecere/bootstrap/Container.c b/compiler/bootstrap/ecere/bootstrap/Container.c
index ef2fafd..6b9da01 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/Container.c
+++ b/compiler/bootstrap/ecere/bootstrap/Container.c
@@ -935,7 +935,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa
 })[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Add])(container, data);
 }
 if(isStruct)
-(((void (* )(void *  _class, void *  data))class->templateArgs[2].__anon1.__anon1.dataTypeClass->_vTbl[__ecereVMethodID_class_OnFree])(class->templateArgs[2].__anon1.__anon1.dataTypeClass, ((void * )((uintptr_t)(data)))), data = 0);
+(__ecereNameSpace__ecere__com__eSystem_Delete((void *)(uintptr_t)data), data = 0);
 (*this) = container;
 }
 

diff --git a/ecere/src/com/containers/Container.ec b/ecere/src/com/containers/Container.ec
index a0fd5a1..7982b15 100644 (file)
--- a/ecere/src/com/containers/Container.ec
+++ b/ecere/src/com/containers/Container.ec
@@ -294,7 +294,7 @@ public:
          container.Add(data);
       }
       if(isStruct)
-         delete data;
+         delete (void *)data;
       this = container;
    }
 }

diff --git a/samples/guiAndGfx/openrider/game.ec b/samples/guiAndGfx/openrider/game.ec
index 8280117..7102784 100644 (file)
--- a/samples/guiAndGfx/openrider/game.ec
+++ b/samples/guiAndGfx/openrider/game.ec
@@ -268,8 +268,9 @@ public:
 
    ~Game() { FreeAll(); }
    void FreeAll(void) {
-      for (i:vehicles)
-         delete i;
+      vehicles.Free();
+      delete vehicles;
+      delete lines;
       //we don't need to worry about the other things because they are automatically freed
    }
 
@@ -299,8 +300,7 @@ public:
       version_code = max_version_code_supported;
    }
    void ResetBall(void) {
-      for (i:vehicles)
-         delete i;
+      vehicles.Free();
       vehicles.size = 1;
 
       vehicles[0] = GameBall {