Changeset 62674 in webkit for trunk/JavaScriptCore/wtf/PassRefPtr.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/PassRefPtr.h (modified) (4 diffs)

trunk/JavaScriptCore/wtf/PassRefPtr.h

@@ -77 +77 @@
         T* get() const { return m_ptr; }
 
-        void clear() { T* ptr = m_ptr; derefIfNotNull(ptr); m_ptr = 0; }
+        void clear();
         T* leakRef() const;
 
@@ -152 +152 @@
         T* get() const { return m_ptr; }
 
-        void clear() { derefIfNotNull(m_ptr); m_ptr = 0; }
-        T* releaseRef() const { T* tmp = m_ptr; m_ptr = 0; return tmp; }
+        void clear();
+        T* leakRef() const { T* tmp = m_ptr; m_ptr = 0; return tmp; }
 
         T& operator*() const { return *m_ptr; }
         T* operator->() const { return m_ptr; }
+
+        // FIXME: Remove releaseRef once we change all callers to call leakRef instead.
+        T* releaseRef() const { return leakRef(); }
 
     private:
@@ -169 +172 @@
     }
 
+    template<typename T> inline void PassRefPtr<T>::clear()
+    {
+        T* ptr = m_ptr;
+        m_ptr = 0;
+        derefIfNotNull(ptr);
+    }
+
     template<typename T> inline T* PassRefPtr<T>::leakRef() const
     {
@@ -280 +290 @@
     {
         return p.get();
+    }
+
+    template<typename T> inline void NonNullPassRefPtr<T>::clear()
+    {
+        T* ptr = m_ptr;
+        m_ptr = 0;
+        derefIfNotNull(ptr);
     }