From e458d70a0d18538346f41b503114c9ebe6b2ce12 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 15 Jul 2010 12:03:35 +0100
Subject: Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
---
 JavaScriptCore/wtf/gobject/GOwnPtr.h | 3 ++-
 JavaScriptCore/wtf/gobject/GRefPtr.h | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'JavaScriptCore/wtf/gobject')

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; }
-- 
cgit v1.1