[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[zecke at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3b81221f8c5a582a385a4d78f68a2da5194416fc
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 10:50:16 2010 +0000

    [Gtk] Check if the renderer() exists in textForObject.
    
    This is fixing a crash in the textForObject method. It can
    happen when inspecting AtkObjects in the accerciser, then
    navigating to a new page and still inspecting the old tree.
    
    In this case the AccessibilityObjectWrapperAtk was still
    valid but the included renderer() was returning 0. Add a
    check for the accObject->renderer() before trying to use
    the result.
    
    * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
    (textForObject):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c94ddb7..db4c515 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-04  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] Check if the renderer() exists in textForObject.
+
+        This is fixing a crash in the textForObject method. It can
+        happen when inspecting AtkObjects in the accerciser, then
+        navigating to a new page and still inspecting the old tree.
+
+        In this case the AccessibilityObjectWrapperAtk was still
+        valid but the included renderer() was returning 0. Add a
+        check for the accObject->renderer() before trying to use
+        the result.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (textForObject):
+
 2010-02-04  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index 87070cd..a4d1638 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -876,7 +876,7 @@ gchar* textForObject(AccessibilityRenderObject* accObject)
             g_string_append(str, "\n");
             range = accObject->doAXRangeForLine(++lineNumber);
         }
-    } else {
+    } else if (accObject->renderer()) {
         // For RenderBlocks, piece together the text from the RenderText objects they contain.
         for (RenderObject* obj = accObject->renderer()->firstChild(); obj; obj = obj->nextSibling()) {
             if (obj->isBR()) {

-- 
WebKit Debian packaging