Fix potencial bug with owner pointer.

Change-Id: I8d1202b29bb71ce779502e4ce19c01a89207b696

diff --git a/dali/internal/common/owner-pointer.h b/dali/internal/common/owner-pointer.h
index 7b92978..5ce648f 100644 (file)
--- a/dali/internal/common/owner-pointer.h
+++ b/dali/internal/common/owner-pointer.h
@@ -38,8 +38,8 @@ public:
    * Default constructor. Creates an OwnerPointer that does not own any object.
    */
   OwnerPointer()
+  : mObject(NULL)
   {
-    mObject = NULL;
   }
 
   /**
@@ -47,8 +47,8 @@ public:
    * @param[in] object A pointer to a heap allocated object.
    */
   OwnerPointer( T* object )
+  : mObject(object)
   {
-    mObject = object;
   }
 
   /**
@@ -56,8 +56,9 @@ public:
    * @param[in] other The pointer that gives away the ownership.
    */
   OwnerPointer( OwnerPointer& other )
+  : mObject(NULL)
   {
-    Init( other );
+    Swap( other );
   }
 
   /**
@@ -68,8 +69,8 @@ public:
   {
     if( this != &other )    // no self-assignment
     {
-      Reset();
-      Init( other );
+      // Creation of temportaty object to prevent premature deletion of object
+      OwnerPointer(other).Swap(*this);
     }
 
     // return self
@@ -183,6 +184,16 @@ public:
     return mObject;
   }
 
+  /**
+   * Swap owned objects
+   */
+  void Swap( OwnerPointer& other )
+  {
+    T* tmp = mObject;
+    mObject = other.mObject;
+    other.mObject = tmp;
+  }
+
   // Handle comparisons - This is a variation of the safe bool idiom
 
   /**
@@ -206,19 +217,6 @@ private:
    */
   void ThisIsSaferThanReturningVoidStar() const {}
 
-private:
-
-  /**
-   * Initialise this pointer from another one.
-   * ownerPointer parameter looses ownership.
-   * @param ownerPointer owner pointer
-   */
-  void Init( OwnerPointer& ownerPointer )
-  {
-    mObject = ownerPointer.mObject;
-    ownerPointer.mObject = NULL;
-  }
-
   // data
   T* mObject; ///< Raw pointer to the object
 };