Changeset 62674 in webkit for trunk/JavaScriptCore/wtf/OwnArrayPtr.h

Timestamp:

Jul 7, 2010, 9:07:29 AM (15 years ago)

Author:

Darin Adler

Message:

Make clear set the pointer to 0 before deletion
​https://bugs.webkit.org/show_bug.cgi?id=41727

Reviewed by Adam Barth.

• wtf/OwnArrayPtr.h: Changed code so we always set the pointer to its new

value before deleting the old one, including in the set function and the
clear function. This required changing safeDelete.

• wtf/OwnPtr.h: Ditto. Also removed some extra null checks.
• wtf/PassOwnPtr.h: Ditto.

• wtf/PassRefPtr.h: Changed code so we always set the pointer to its new

value before deref'ing the old one in the clear function. Also added a
leakRef function for NonNullPassRefPtr.

• wtf/RefPtr.h: Ditto.

• wtf/gobject/GOwnPtr.h: More of the same.
• wtf/gobject/GRefPtr.h: Ditto.

File:

• trunk/JavaScriptCore/wtf/OwnArrayPtr.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/OwnArrayPtr.h

@@ -31 +31 @@
     public:
         explicit OwnArrayPtr(T* ptr = 0) : m_ptr(ptr) { }
-        ~OwnArrayPtr() { safeDelete(); }
+        ~OwnArrayPtr() { safeDelete(m_ptr); }
 
         T* get() const { return m_ptr; }
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
 
-        // FIXME: This should be renamed to adopt. 
+        // FIXME: This should be removed and replaced with PassOwnArrayPtr. 
         void set(T* ptr)
         {
             ASSERT(!ptr || m_ptr != ptr);
-            safeDelete();
+            T* oldPtr = m_ptr;
             m_ptr = ptr;
+            safeDelete(oldPtr);
         }
 
-        void clear() { safeDelete(); m_ptr = 0; }
+        void clear();
 
         T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
@@ -64 +65 @@
 
     private:
-        void safeDelete() { typedef char known[sizeof(T) ? 1 : -1]; if (sizeof(known)) delete [] m_ptr; }
+        static void safeDelete(T*);
 
         T* m_ptr;
     };
     
+    template<typename T> inline void OwnArrayPtr<T>::clear()
+    {
+        T* ptr = m_ptr;
+        m_ptr = 0;
+        safeDelete(ptr);
+    }
+
+    template<typename T> inline void OwnArrayPtr<T>::safeDelete(T* ptr)
+    {
+        typedef char known[sizeof(T) ? 1 : -1];
+        if (sizeof(known))
+            delete [] ptr;
+    }
+
     template <typename T> inline void swap(OwnArrayPtr<T>& a, OwnArrayPtr<T>& b) { a.swap(b); }