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

Unified Diff: content/renderer/pepper/pepper_video_encoder_host.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/pepper/pepper_video_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index 0e1a19995b2eb0211e5a2abece04c06bc080521b..4b8e746387fc793628341c880abd69d2c8131466 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -632,6 +632,10 @@ scoped_refptr<media::VideoFrame> PepperVideoEncoderHost::CreateVideoFrame(
input_coded_size_, static_cast<uint8*>(buffer->video.data),
buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset,
base::TimeDelta());
+ if (!frame) {
+ NotifyPepperError(PP_ERROR_FAILED);
+ return frame;
+ }
frame->AddDestructionObserver(
base::Bind(&PepperVideoEncoderHost::FrameReleased,
weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id));

Powered by Google App Engine
This is Rietveld 408576698