[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit dd9eaa257d53f771633a34cf43f59c39bdb5babc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 18:09:13 2009 +0000

    2009-10-12  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
    
            Reviewed by Gustavo Noronha.
    
            https://bugs.webkit.org/show_bug.cgi?id=30307
    
            Fix 0 sentinel for g_object_set() function call.
    
            * platform/graphics/gtk/DataSourceGStreamer.cpp:
            (webkit_data_src_uri_set_uri):
            0 is passed as 32 bit value on x86-64 in vararg functions, but
            g_object_set() expects a 64 bit 0. This will cause crashes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a10168..d9084b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-12  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
+
+        Reviewed by Gustavo Noronha.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30307
+        
+        Fix 0 sentinel for g_object_set() function call.
+
+        * platform/graphics/gtk/DataSourceGStreamer.cpp:
+        (webkit_data_src_uri_set_uri):
+        0 is passed as 32 bit value on x86-64 in vararg functions, but
+        g_object_set() expects a 64 bit 0. This will cause crashes.
+
 2009-10-12  Cameron McCormack  <cam at mcc.id.au>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp b/WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp
index a6c2dfb..567da74 100644
--- a/WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/DataSourceGStreamer.cpp
@@ -214,7 +214,7 @@ static gboolean webkit_data_src_uri_set_uri(GstURIHandler* handler, const gchar*
             GInputStream* stream = g_memory_input_stream_new_from_data(decoded_data,
                                                                        decoded_size,
                                                                        g_free);
-            g_object_set(src->kid, "stream", stream, 0);
+            g_object_set(src->kid, "stream", stream, NULL);
             g_object_unref(stream);
 
             if (src->uri) {

-- 
WebKit Debian packaging