[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit fd66748c5b19724fa1333eafa0489f167bfd5b83
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 10:37:51 2009 +0000

    2009-12-18  Martin Robinson  <martin.james.robinson at gmail.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Compile warning from line 29 of GRefPtr.cpp
            https://bugs.webkit.org/show_bug.cgi?id=32703
    
            Fix memory leak and compiler warning in GRefPtr GHashTable template
            specialization.
    
            * wtf/gtk/GRefPtr.cpp:
            (WTF::refGPtr):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ca0fe32..c4104df 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-18  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Compile warning from line 29 of GRefPtr.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=32703
+
+        Fix memory leak and compiler warning in GRefPtr GHashTable template
+        specialization.
+
+        * wtf/gtk/GRefPtr.cpp:
+        (WTF::refGPtr):
+
 2009-12-17  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Mark Rowe.
diff --git a/JavaScriptCore/wtf/gtk/GRefPtr.cpp b/JavaScriptCore/wtf/gtk/GRefPtr.cpp
index 8dc4591..e7cf34b 100644
--- a/JavaScriptCore/wtf/gtk/GRefPtr.cpp
+++ b/JavaScriptCore/wtf/gtk/GRefPtr.cpp
@@ -25,7 +25,9 @@ namespace WTF {
 
 template <> GHashTable* refGPtr(GHashTable* ptr)
 {
-    g_hash_table_ref(ptr);
+    if (ptr)
+        g_hash_table_ref(ptr);
+    return ptr;
 }
 
 template <> void derefGPtr(GHashTable* ptr)

-- 
WebKit Debian packaging