Changeset 6533

Timestamp:

Mar 16, 2010, 10:49:35 AM (14 years ago)

Author:

dafrick

Message:

Resolved segmentation fault, when destroying a PickupCompilation.

Location:

code/trunk/src

Files:

• modules/pickup/Pickup.cc (modified) (1 diff)
• modules/pickup/PickupCollection.cc (modified) (9 diffs)
• modules/pickup/PickupCollection.h (modified) (1 diff)
• orxonox/interfaces/InterfaceCompilation.cc (modified) (1 diff)
• orxonox/interfaces/PickupCarrier.h (modified) (1 diff)
• orxonox/interfaces/Pickupable.h (modified) (1 diff)

code/trunk/src/modules/pickup/Pickup.cc

@@ -73 +73 @@
     void Pickup::initializeIdentifier(void)
     {        
-        //TODO: Works?
         std::string val1 = this->getActivationType();
         std::string type1 = "activationType";

code/trunk/src/modules/pickup/PickupCollection.cc

@@ -65 +65 @@
     {
         //! Destroy all Pickupables constructing this PickupCollection.
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            (*it)->destroy();
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            if((*it).get() != NULL)
+                (*it).get()->destroy();
         }
     }
@@ -86 +87 @@
     void PickupCollection::initializeIdentifier(void)
     {
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            this->pickupCollectionIdentifier_->addPickup((*it)->getPickupIdentifier());
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            this->pickupCollectionIdentifier_->addPickup((*it).get()->getPickupIdentifier());
         }
     }
@@ -121 +122 @@
             return false;
         
-        this->pickups_.push_back(pickup);
+        WeakPtr<Pickupable> ptr = pickup;
+        this->pickups_.push_back(ptr);
         return true;
     }
@@ -135 +137 @@
     const Pickupable* PickupCollection::getPickupable(unsigned int index)
     {
-        return this->pickups_[index]; //TODO. Does this work?
+        return this->pickups_[index].get(); //TODO. Does this work?
     }
     
@@ -143 +145 @@
         
         //! Change used for all Pickupables this PickupCollection consists of.
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            (*it)->setUsed(this->isUsed());
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            (*it).get()->setUsed(this->isUsed());
         }
     }
@@ -154 +156 @@
         
         //! Change used for all Pickupables this PickupCollection consists of.
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            (*it)->setCarrier(this->getCarrier());
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            (*it).get()->setCarrier(this->getCarrier());
         }
     }
@@ -165 +167 @@
         
         //! Change the carrier for all Pickupables this PickupCollection consists of.
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            (*it)->setPickedUp(this->isPickedUp());
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            (*it).get()->setPickedUp(this->isPickedUp());
         }
     }
@@ -179 +181 @@
         
         PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
-        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            Pickupable* newPickup = (*it)->clone();
+        for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            Pickupable* newPickup = (*it).get()->clone();
             pickup->addPickupable(newPickup);
         }
@@ -190 +192 @@
     bool PickupCollection::isTarget(Identifier* identifier) const
     {
-        for(std::vector<Pickupable*>::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
-        {
-            if(!(*it)->isTarget(identifier))
+        for(std::vector<WeakPtr<Pickupable> >::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            if(!(*it).get()->isTarget(identifier))
                 return false;
         }

code/trunk/src/modules/pickup/PickupCollection.h

@@ -79 +79 @@
         private:
             
-            std::vector<Pickupable*> pickups_;
+            std::vector<WeakPtr<Pickupable> > pickups_;
         
     };

code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -64 +64 @@
     PickupCarrier::~PickupCarrier()
     {
-        for(std::set<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        while(this->pickups_.size() > 0)
         {
+            std::set<Pickupable*>::iterator it = this->pickups_.begin();
+            this->pickups_.erase(it);
             (*it)->destroy();
         }
-        
+
         this->pickups_.clear();
     }

code/trunk/src/orxonox/interfaces/PickupCarrier.h

@@ -41 +41 @@
 #include "Pickupable.h"
 #include "core/Identifier.h"
+#include "core/WeakPtr.h"
 
 #include "core/OrxonoxClass.h"

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -114 +114 @@
                 { return this->pickupIdentifier_; }
                 
-            virtual void destroy(void)
-                { delete this; }
-                
             //TODO: Make them work as protected.
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.