Changeset 12149 in webkit for trunk/JavaScriptCore/kxmlcore/RefPtr.h

Timestamp:

Jan 17, 2006, 9:28:35 AM (19 years ago)

Author:

darin

Message:

Reviewed by Anders.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6610 change RefPtr so that it works when deref ends up deleting the RefPtr

• kxmlcore/PassRefPtr.h: Always set m_ptr before calling deref.
• kxmlcore/RefPtr.h: Ditto.

File:

• trunk/JavaScriptCore/kxmlcore/RefPtr.h (modified) (5 diffs)

trunk/JavaScriptCore/kxmlcore/RefPtr.h

@@ -75 +75 @@
     template <typename T> RefPtr<T>& RefPtr<T>::operator=(const RefPtr<T>& o)
     {
-        T *optr = o.m_ptr;
+        T* optr = o.m_ptr;
         if (optr)
             optr->ref();
-        if (m_ptr)
-            m_ptr->deref();
+        T* ptr = m_ptr;
         m_ptr = optr;
+        if (ptr)
+            ptr->deref();
         return *this;
     }
@@ -89 +90 @@
         if (optr)
             optr->ref();
-        if (m_ptr)
-            m_ptr->deref();
+        T* ptr = m_ptr;
         m_ptr = optr;
+        if (ptr)
+            ptr->deref();
         return *this;
     }
@@ -99 +101 @@
         if (optr)
             optr->ref();
-        if (m_ptr)
-            m_ptr->deref();
+        T* ptr = m_ptr;
         m_ptr = optr;
+        if (ptr)
+            ptr->deref();
         return *this;
     }
@@ -107 +110 @@
     template <typename T> inline RefPtr<T>& RefPtr<T>::operator=(const PassRefPtr<T>& o)
     {
-        if (m_ptr)
-            m_ptr->deref();
+        T* ptr = m_ptr;
         m_ptr = o.release();
+        if (ptr)
+            ptr->deref();
         return *this;
     }
@@ -115 +119 @@
     template <typename T> template <typename U> inline RefPtr<T>& RefPtr<T>::operator=(const PassRefPtr<U>& o)
     {
-        if (m_ptr)
-            m_ptr->deref();
+        T* ptr = m_ptr;
         m_ptr = o.release();
+        if (ptr)
+            ptr->deref();
         return *this;
     }