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

Unified Diff: content/renderer/media/media_stream_video_track.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LOG in video_Frame and CHECK/return outside. Created 5 years 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
Index: content/renderer/media/media_stream_video_track.cc
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index 15eeb83fbdaf007d637ee4b56020166cb64af367..cc986d768097c371293424ed4ef8ad01580eacb2 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -177,6 +177,8 @@ MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame(
media::VideoFrame::WrapVideoFrame(
black_frame_, black_frame_->visible_rect(),
black_frame_->natural_size());
+ if (!wrapped_black_frame)
+ return nullptr;
wrapped_black_frame->AddDestructionObserver(
base::Bind(&ReleaseOriginalFrame, black_frame_));

Powered by Google App Engine
This is Rietveld 408576698