Check nullptr before using in FireWinAccessibilityEvent

Previous codes can occur crash when calling GetRole() or GetBoolAttribute() if target is nullptr. This patch check null pointer before using it to prevent crash. BUG=NONE Change-Id: Ia65c0e0834bebf3be71caa991e65e721f4640e68 Reviewed-on: https://chromium-review.googlesource.com/587513 Reviewed-by: Dominic Mazzoni <[email protected]> Commit-Queue: Dominic Mazzoni <[email protected]> Cr-Commit-Position: refs/heads/master@{#489992}
feiyue1206 · Jul 27, 2017 · 3d4a5bf · 3d4a5bf
1 parent 38f01d4
commit 3d4a5bf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -175,6 +175,9 @@ BrowserAccessibilityEvent::Result
   if (user_is_navigating_away_)
     return BrowserAccessibilityEvent::DiscardedBecauseUserNavigatingAway;
 
+  if (!target)
+    return BrowserAccessibilityEvent::FailedBecauseNoFocus;
+
   // Inline text boxes are an internal implementation detail, we don't
   // expose them to Windows.
   if (target->GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX)
@@ -186,9 +189,6 @@ BrowserAccessibilityEvent::Result
     return BrowserAccessibilityEvent::DiscardedBecauseLiveRegionBusy;
   }
 
-  if (!target)
-    return BrowserAccessibilityEvent::FailedBecauseNoFocus;
-
   event->set_target(target);
 
   // It doesn't make sense to fire a REORDER event on a leaf node; that