[SCM] WebKit Debian packaging branch, debian/unstable, updated. upstream/1.1.20-241-g73d16d1
Gustavo Noronha Silva
kov at debian.org
Thu Feb 4 22:26:40 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 7f7abc3edb8fe3aa2dc6893342e109999bd4db36
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/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index ac6a2c4..487fa5b 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
More information about the Pkg-webkit-commits
mailing list