Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ui/accessibility/platform/ax_platform_node_auralinux.cc

Issue 1146973004: Possible browser crash while traversing tree of accessibility objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accessibility/platform/ax_platform_node_auralinux.cc
diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
index 05e290d31064f09bb15e6a64ea520a5ec4e033d1..722280a97784ca0da65ad42f4fa3ca48db91269c 100644
--- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
+++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
@@ -188,6 +188,9 @@ static AtkStateSet* ax_platform_node_auralinux_ref_state_set(
//
static gfx::Point FindAtkObjectParentCoords(AtkObject* atk_object) {
+ if (!atk_object)
+ return gfx::Point(0, 0);
+
if (atk_object_get_role(atk_object) == ATK_ROLE_WINDOW) {
int x, y;
atk_component_get_extents(ATK_COMPONENT(atk_object),
@@ -501,12 +504,13 @@ void AXPlatformNodeAuraLinux::SetExtentsRelativeToAtkCoordinateType(
*height = extents.height();
if (coord_type == ATK_XY_WINDOW) {
- AtkObject* atk_object = GetParent();
- gfx::Point window_coords = FindAtkObjectParentCoords(atk_object);
- if (x)
- *x -= window_coords.x();
- if (y)
- *y -= window_coords.y();
+ if (AtkObject* atk_object = GetParent()) {
+ gfx::Point window_coords = FindAtkObjectParentCoords(atk_object);
+ if (x)
+ *x -= window_coords.x();
+ if (y)
+ *y -= window_coords.y();
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698