Fix WeakPersistent null deref [chromium/src : main]

Thomas Guilbert (Gerrit)

unread,

22 Sept 2021, 5:18:58 pm22/9/21

to Yutaka Hirano, blink-rev...@chromium.org, blink-...@chromium.org, eric.c...@apple.com, feature-me...@chromium.org, poscia...@chromium.org, Thomas Guilbert

Attention is currently required from: Yutaka Hirano.

Thomas Guilbert would like Yutaka Hirano to review this change.

View Change

Fix WeakPersistent null deref

This CL adds a check to make sure the HTMLVideoElement is still alive
before accessing it. This happens because the posted lambda runs even
if the WeakPersistent is invalidated.

Bug: 1250995, 1251364
Change-Id: Icc81250721bad83041244e8d9ff5153c5f7afdfa
---
M third_party/blink/renderer/core/html/media/html_video_element.cc
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/blink/renderer/core/html/media/html_video_element.cc b/third_party/blink/renderer/core/html/media/html_video_element.cc
index 3b5dd16..333991b 100644
--- a/third_party/blink/renderer/core/html/media/html_video_element.cc
+++ b/third_party/blink/renderer/core/html/media/html_video_element.cc
@@ -739,7 +739,7 @@
   lazy_load_intersection_observer_ = nullptr;
 
   auto notify_visible = [](HTMLVideoElement* self) {
-    if (self->web_media_player_)
+    if (self && self->web_media_player_)
       self->web_media_player_->OnBecameVisible();
   };

To view, visit change 3176371. To unsubscribe, or for help writing mail filters, visit settings.

Thomas Guilbert (Gerrit)

unread,

22 Sept 2021, 5:19:04 pm22/9/21

to Thomas Guilbert, blink-rev...@chromium.org, blink-...@chromium.org, eric.c...@apple.com, feature-me...@chromium.org, poscia...@chromium.org, Yutaka Hirano, chromium...@chromium.org, srirama chandra sekhar

Attention is currently required from: Yutaka Hirano.

Patch set 1:Auto-Submit +1Commit-Queue +1

View Change

1 comment:

Patchset:
- Patch Set #1:
  PTAL, thanks!

To view, visit change 3176371. To unsubscribe, or for help writing mail filters, visit settings.

Yutaka Hirano (Gerrit)

unread,

23 Sept 2021, 7:48:49 pm23/9/21

to Thomas Guilbert, blink-rev...@chromium.org, blink-...@chromium.org, eric.c...@apple.com, feature-me...@chromium.org, poscia...@chromium.org, Yutaka Hirano, Chromium LUCI CQ, chromium...@chromium.org, srirama chandra sekhar

Attention is currently required from: Thomas Guilbert.

Patch set 1:Code-Review +1Commit-Queue +2

View Change

To view, visit change 3176371. To unsubscribe, or for help writing mail filters, visit settings.

Chromium LUCI CQ (Gerrit)

unread,

23 Sept 2021, 8:58:46 pm23/9/21

to Thomas Guilbert, blink-rev...@chromium.org, blink-...@chromium.org, eric.c...@apple.com, feature-me...@chromium.org, poscia...@chromium.org, Yutaka Hirano, chromium...@chromium.org, srirama chandra sekhar

Chromium LUCI CQ submitted this change.

View Change

Approvals:
  Yutaka Hirano: Looks good to me; Commit
  Thomas Guilbert: Send CL to CQ automatically after approval

Fix WeakPersistent null deref

This CL adds a check to make sure the HTMLVideoElement is still alive
before accessing it. This happens because the posted lambda runs even
if the WeakPersistent is invalidated.

Bug: 1250995, 1251364
Change-Id: Icc81250721bad83041244e8d9ff5153c5f7afdfa

Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3176371
Auto-Submit: Thomas Guilbert <tgui...@chromium.org>
Commit-Queue: Yutaka Hirano <yhi...@chromium.org>
Reviewed-by: Yutaka Hirano <yhi...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#924577}


---
M third_party/blink/renderer/core/html/media/html_video_element.cc
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/blink/renderer/core/html/media/html_video_element.cc b/third_party/blink/renderer/core/html/media/html_video_element.cc
index 3b5dd16..333991b 100644
--- a/third_party/blink/renderer/core/html/media/html_video_element.cc
+++ b/third_party/blink/renderer/core/html/media/html_video_element.cc
@@ -739,7 +739,7 @@
   lazy_load_intersection_observer_ = nullptr;
 
   auto notify_visible = [](HTMLVideoElement* self) {
-    if (self->web_media_player_)
+    if (self && self->web_media_player_)
       self->web_media_player_->OnBecameVisible();
   };

To view, visit change 3176371. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward