2 files changed, 5 insertions, 3 deletions
diff --git a/JavaScriptCore/wtf/gobject/GOwnPtr.h b/JavaScriptCore/wtf/gobject/GOwnPtr.h
index 1fc594c..40c0bf4 100644
--- a/JavaScriptCore/wtf/gobject/GOwnPtr.h
+++ b/JavaScriptCore/wtf/gobject/GOwnPtr.h
@@ -78,8 +78,9 @@ public:
 
     void clear()
     {
-        freeOwnedGPtr(m_ptr);
+        T* ptr = m_ptr;
         m_ptr = 0;
+        freeOwnedGPtr(ptr);
     }
 
     T& operator*() const
diff --git a/JavaScriptCore/wtf/gobject/GRefPtr.h b/JavaScriptCore/wtf/gobject/GRefPtr.h
index 3a33605..c4d4107 100644
--- a/JavaScriptCore/wtf/gobject/GRefPtr.h
+++ b/JavaScriptCore/wtf/gobject/GRefPtr.h
@@ -52,9 +52,10 @@ public:
 
     void clear()
     {
-        if (T* ptr = m_ptr)
-            derefGPtr(ptr);
+        T* ptr = m_ptr;
         m_ptr = 0;
+        if (ptr)
+            derefGPtr(ptr);
     }
 
     T* get() const { return m_ptr; }