Changeset 7885 for code/trunk

Timestamp:

Feb 14, 2011, 3:27:56 PM (14 years ago)

Author:

landauf

Message:

fixed minor memory leak

Location:

code/trunk/src/modules/pong

Files:

• PongBall.cc (modified) (4 diffs)
• PongBall.h (modified) (1 diff)

code/trunk/src/modules/pong/PongBall.cc

@@ -48 +48 @@
         this->accelerationFactor_ = 1.0f;
         this->bat_ = 0;
+        this->bDeleteBats_ = false;
         this->batID_ = new unsigned int[2];
         this->batID_[0] = OBJECTID_UNKNOWN;
@@ -58 +59 @@
     PongBall::~PongBall()
     {
+        if (this->isInitialized())
+        {
+            if (this->bDeleteBats_)
+                delete[] this->bat_;
+
+            delete[] this->batID_;
+        }
     }
 
@@ -167 +175 @@
     void PongBall::setBats(WeakPtr<PongBat>* bats)
     {
+        if (this->bDeleteBats_)
+        {
+            delete[] this->bat_;
+            this->bDeleteBats_ = false;
+        }
+
         this->bat_ = bats;
         this->batID_[0] = this->bat_[0]->getObjectID();
@@ -175 +189 @@
     {
         if (!this->bat_)
-            this->bat_ = new WeakPtr<PongBat>[2]; // TODO: delete this somewhere
+        {
+            if (this->bDeleteBats_)
+                delete[] this->bat_;
+            else
+                this->bDeleteBats_ = true;
+
+            this->bat_ = new WeakPtr<PongBat>[2];
+        }
+
         if (this->batID_[0] != OBJECTID_UNKNOWN)
             this->bat_[0] = orxonox_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0]));

code/trunk/src/modules/pong/PongBall.h

@@ -80 +80 @@
             float batlength_;
             WeakPtr<PongBat>* bat_;
+            bool bDeleteBats_;
             unsigned int* batID_;
             float relMercyOffset_;