commit 8d00fa7e1ef54804565c9329b83a6ede0006c9d8
author mario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Apr 13 16:27:23 2011 +0000
committer mario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Apr 13 16:27:23 2011 +0000
tree 60ee0663a6e00e614565ffff198f85dda1dad2e8
parent e7336fbb8a4bc4e898eead538bb5f2f1426b3426

2011-04-13  Mario Sanchez Prada  <msanchez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Missing nullchecks in GTK's a11y wrapper
        https://bugs.webkit.org/show_bug.cgi?id=58429

        Add missing nullchecks for coreObject->document().

        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
        (atkParentOfRootObject): Add missing nullcheck.
        (getPangoLayoutForAtk): Ditto.
        (webkit_accessible_text_get_caret_offset): Ditto.
        (textExtents): Ditto.
        (webkit_accessible_editable_text_insert_text): Ditto.
        (webkit_accessible_editable_text_delete_text): Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@83746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

diff --git a/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index bd65e8f..4c7a364 100644
--- a/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -268,7 +268,11 @@
     // impossible for assistive technologies to ascend the accessible
     // hierarchy all the way to the application. (Bug 30489)
     if (!coreParent && isRootObject(coreObject)) {
-        HostWindow* hostWindow = coreObject->document()->view()->hostWindow();
+        Document* document = coreObject->document();
+        if (!document)
+            return 0;
+
+        HostWindow* hostWindow = document->view()->hostWindow();
         if (hostWindow) {
             PlatformPageClient scrollView = hostWindow->platformPageClient();
             if (scrollView) {
@@ -1176,7 +1180,11 @@
 {
     AccessibilityObject* coreObject = core(textObject);
 
-    HostWindow* hostWindow = coreObject->document()->view()->hostWindow();
+    Document* document = coreObject->document();
+    if (!document)
+        return 0;
+
+    HostWindow* hostWindow = document->view()->hostWindow();
     if (!hostWindow)
         return 0;
     PlatformPageClient webView = hostWindow->platformPageClient();
@@ -1218,12 +1226,16 @@
     if (!coreObject->isAccessibilityRenderObject())
         return 0;
 
+    Document* document = coreObject->document();
+    if (!document)
+        return 0;
+
     Node* focusedNode = coreObject->selection().end().deprecatedNode();
     if (!focusedNode)
         return 0;
 
     RenderObject* focusedRenderer = focusedNode->renderer();
-    AccessibilityObject* focusedObject = coreObject->document()->axObjectCache()->getOrCreate(focusedRenderer);
+    AccessibilityObject* focusedObject = document->axObjectCache()->getOrCreate(focusedRenderer);
 
     int offset;
     // Don't ignore links if the offset is being requested for a link.
@@ -1541,7 +1553,8 @@
     IntRect extents = coreObject->doAXBoundsForRange(PlainTextRange(startOffset, rangeLength));
     switch(coords) {
     case ATK_XY_SCREEN:
-        extents = coreObject->document()->view()->contentsToScreen(extents);
+        if (Document* document = coreObject->document())
+            extents = document->view()->contentsToScreen(extents);
         break;
     case ATK_XY_WINDOW:
         // No-op
@@ -1813,12 +1826,14 @@
     //coreObject->setSelectedTextRange(PlainTextRange(*position, 0));
     //coreObject->setSelectedText(String::fromUTF8(string));
 
-    if (!coreObject->document() || !coreObject->document()->frame())
+    Document* document = coreObject->document();
+    if (!document || !document->frame())
         return;
+
     coreObject->setSelectedVisiblePositionRange(coreObject->visiblePositionRangeForRange(PlainTextRange(*position, 0)));
     coreObject->setFocused(true);
     // FIXME: We should set position to the actual inserted text length, which may be less than that requested.
-    if (coreObject->document()->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0))
+    if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0))
         *position += length;
 }
 
@@ -1839,11 +1854,13 @@
     //coreObject->setSelectedTextRange(PlainTextRange(start_pos, end_pos - start_pos));
     //coreObject->setSelectedText(String());
 
-    if (!coreObject->document() || !coreObject->document()->frame())
+    Document* document = coreObject->document();
+    if (!document || !document->frame())
         return;
+
     coreObject->setSelectedVisiblePositionRange(coreObject->visiblePositionRangeForRange(PlainTextRange(start_pos, end_pos - start_pos)));
     coreObject->setFocused(true);
-    coreObject->document()->frame()->editor()->performDelete();
+    document->frame()->editor()->performDelete();
 }
 
 static void webkit_accessible_editable_text_paste_text(AtkEditableText* text, gint position)