diff options
| author | Lan Wei <lanwei@chromium.org> | 2021-04-20 17:08:53 +0000 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2021-04-21 10:49:03 +0000 |
| commit | 3f594ea1afb8b18c864715a796ef21099d432a13 (patch) | |
| tree | babac3ae2ceaad599a2ee2040494c7cdc805975c | |
| parent | 547614323c1316416b42acc87fb31e3078c5885e (diff) | |
[Backport] Security bug 1155297 (3/3)
Cherry-pick of patch originally reviewed on
https://chromium-review.googlesource.com/c/chromium/src/+/2838329:
M86-LTS: Add null pointer check in RenderWidgetHostInputEventRouter
We have some crashes in RenderWidgetHostInputEventRouter class, we are
adding some null pointer check in this class to avoid the crash.
(cherry picked from commit 5f47666b79ac7ded20e1c7657037498561bd3352)
Bug: 1155297
Change-Id: I3b63d5748523ae2ce8ab469832adfc75d586e411
Reviewed-by: Charlie Reis <creis@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#871108}
Reviewed-by: Lan Wei <lanwei@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Owners-Override: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/branch-heads/4240@{#1617}
Cr-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/renderer_host/render_widget_host_input_event_router.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/browser/renderer_host/render_widget_host_input_event_router.cc b/chromium/content/browser/renderer_host/render_widget_host_input_event_router.cc index a622ff9c357..e3b24c43cea 100644 --- a/chromium/content/browser/renderer_host/render_widget_host_input_event_router.cc +++ b/chromium/content/browser/renderer_host/render_widget_host_input_event_router.cc @@ -1970,7 +1970,7 @@ void RenderWidgetHostInputEventRouter::OnAggregatedHitTestRegionListUpdated( const std::vector<viz::AggregatedHitTestRegion>& hit_test_data) { for (auto& region : hit_test_data) { auto iter = owner_map_.find(region.frame_sink_id); - if (iter != owner_map_.end()) + if (iter != owner_map_.end() && iter->second) iter->second->NotifyHitTestRegionUpdated(region); } } |