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

trunk/JavaScriptCore/kxmlcore/PassRefPtr.h

@@ -75 +75 @@
     template <typename T> template <typename U> inline PassRefPtr<T>& PassRefPtr<T>::operator=(const RefPtr<U>& o) 
     {
-        T *optr = o.m_ptr;
+        T* optr = o.m_ptr;
         if (optr)
             optr->ref();
-        if (T *ptr = m_ptr)
+        T* ptr = m_ptr;
+        m_ptr = optr;
+        if (ptr)
             ptr->deref();
-        m_ptr = optr;
         return *this;
     }
@@ -88 +89 @@
         if (optr)
             optr->ref();
-        if (T *ptr = m_ptr)
+        T* ptr = m_ptr;
+        m_ptr = optr;
+        if (ptr)
             ptr->deref();
-        m_ptr = optr;
         return *this;
     }
@@ -96 +98 @@
     template <typename T> inline PassRefPtr<T>& PassRefPtr<T>::operator=(const PassRefPtr<T>& ref)
     {
-        T *optr = ref.release();
-        if (T *ptr = m_ptr)
+        T* ptr = m_ptr;
+        m_ptr = ref.release();
+        if (ptr)
             ptr->deref();
-        m_ptr = optr;
         return *this;
     }
@@ -105 +107 @@
     template <typename T> template <typename U> inline PassRefPtr<T>& PassRefPtr<T>::operator=(const PassRefPtr<U>& ref)
     {
-        T *optr = ref.release();
-        if (T *ptr = m_ptr)
+        T* ptr = m_ptr;
+        m_ptr = ref.release();
+        if (ptr)
             ptr->deref();
-        m_ptr = optr;
         return *this;
     }