[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[kov at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 9a2b62e285c21bb9763618500a5e57fda8897ec6
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 01:25:38 2010 +0000

            Reviewed by Eric Seidel.
    
            [GTK] Crashes cleaning clipboard contents, with page cache enabled
            https://bugs.webkit.org/show_bug.cgi?id=32900
    
            Null-check the focus controller to avoid crashing. Could not find
            a way to reproduce this consistently, thus no test.
    
            * WebCoreSupport/PasteboardHelperGtk.cpp:
            (WebKit::clearClipboardContentsCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 7f9f8eb..037f28d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-14  Gustavo Noronha Silva  <gns at gnome.org>
 
+        Reviewed by Eric Seidel.
+
+        [GTK] Crashes cleaning clipboard contents, with page cache enabled
+        https://bugs.webkit.org/show_bug.cgi?id=32900
+
+        Null-check the focus controller to avoid crashing. Could not find
+        a way to reproduce this consistently, thus no test.
+
+        * WebCoreSupport/PasteboardHelperGtk.cpp:
+        (WebKit::clearClipboardContentsCallback):
+
+2010-01-14  Gustavo Noronha Silva  <gns at gnome.org>
+
         Reviewed by Oliver Hunter.
 
         [GTK] couple fixes for signal emissions, and property notifications
diff --git a/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp b/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
index 4dc2b50..37f3b18 100644
--- a/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
@@ -126,6 +126,10 @@ static void clearClipboardContentsCallback(GtkClipboard* clipboard, gpointer dat
     dataObject->clear();
     if (data) {
         WebCore::Page* corePage = reinterpret_cast<WebCore::Page*>(data);
+
+        if (!corePage->focusController())
+            return;
+
         Frame* frame = corePage->focusController()->focusedOrMainFrame();
 
         // Collapse the selection without clearing it

-- 
WebKit Debian packaging