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

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

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: halliwell@ comments. Created 4 years, 11 months 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/video_track_adapter.cc
diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc
index 9f4e2abca32a072fe7043a00c9a03d2b1bc242be..f4ca1d2c746043682e9b90675894b46fba7bc1ab 100644
--- a/content/renderer/media/video_track_adapter.cc
+++ b/content/renderer/media/video_track_adapter.cc
@@ -201,6 +201,11 @@ void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverFrame(
const base::TimeTicks& estimated_capture_time) {
DCHECK(io_thread_checker_.CalledOnValidThread());
+ if (!frame) {
+ DLOG(ERROR) << "Incoming frame is not valid.";
+ return;
+ }
+
double frame_rate;
if (!frame->metadata()->GetDouble(media::VideoFrameMetadata::FRAME_RATE,
&frame_rate)) {
@@ -263,6 +268,8 @@ void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverFrame(
video_frame =
media::VideoFrame::WrapVideoFrame(frame, region_in_frame, desired_size);
+ if (!video_frame)
+ return;
video_frame->AddDestructionObserver(
base::Bind(&ReleaseOriginalFrame, frame));
« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/webrtc/media_stream_remote_video_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698