Changeset 139890 in webkit

Timestamp:

Jan 16, 2013 10:00:17 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Safeguard against possible NULL-dereference
​https://bugs.webkit.org/show_bug.cgi?id=104931

Patch by Claudio Saavedra <Claudio Saavedra> on 2013-01-16
Reviewed by Martin Robinson.

• accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(webkitAccessibleGetIndexInParent): Move the NULL-safeguard to a
place where it actually makes sense.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/atk/WebKitAccessibleWrapperAtk.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] Safeguard against possible NULL-dereference
+        https://bugs.webkit.org/show_bug.cgi?id=104931
+
+        Reviewed by Martin Robinson.
+
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (webkitAccessibleGetIndexInParent): Move the NULL-safeguard to a
+        place where it actually makes sense.
+
 2013-01-16  Avi Drissman  <avi@google.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

@@ -408 +408 @@
     AccessibilityObject* parent = coreObject->parentObjectUnignored();
 
-    if (!parent)
-        return -1;
-
     if (!parent && isRootObject(coreObject)) {
         AtkObject* atkParent = atkParentOfRootObject(object);
@@ -430 +427 @@
     if (parent && parent->isTableRow() && coreObject->isTableCell())
         return getIndexInParentForCellInRow(coreObject);
+
+    if (!parent)
+        return -1;
 
     size_t index = parent->children().find(coreObject);