From 304881d62cdb9193764b070a990106a7020765df Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 8 Jul 2016 13:39:39 -0700 Subject: [PATCH] Don't crash if no root semantics node (#2784) Fixes #4849 --- .../ios/framework/Source/accessibility_bridge.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm b/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm index 3fcb1d208..2e9416211 100644 --- a/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm +++ b/sky/shell/platform/ios/framework/Source/accessibility_bridge.mm @@ -315,8 +315,13 @@ void AccessibilityBridge::UpdateSemanticsTree( } } - if (!view_.accessibilityElements) { - view_.accessibilityElements = @[ objects_[kRootNodeId] ]; + SemanticObject* root = objects_[kRootNodeId]; + if (root) { + if (!view_.accessibilityElements) { + view_.accessibilityElements = @[ root ]; + } + } else { + view_.accessibilityElements = nil; } UIAccessibilityPostNotification( UIAccessibilityLayoutChangedNotification, nil); -- GitLab