content/renderer/pepper/content_decryptor_delegate.cc - Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/content_decryptor_delegate.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

« no previous file with comments | « content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc ('k') | content/renderer/pepper/pepper_media_stream_video_track_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/content_decryptor_delegate.cc

diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc

index fbead03cb30f517bb8d7172d4514dec718206c95..f9f35db17195401d16350cc244fb3c763ea40df1 100644

--- a/content/renderer/pepper/content_decryptor_delegate.cc

+++ b/content/renderer/pepper/content_decryptor_delegate.cc

@@ -1038,6 +1038,11 @@ void ContentDecryptorDelegate::DeliverFrame(

frame_data + frame_info->plane_offsets[PP_DECRYPTEDFRAMEPLANES_V],

base::TimeDelta::FromMicroseconds(

frame_info->tracking_info.timestamp));

+ if (!decoded_frame) {

+ FreeBuffer(frame_info->tracking_info.buffer_id);

+ video_decode_cb.Run(Decryptor::kError, NULL);

+ return;

+ }

decoded_frame->AddDestructionObserver(

media::BindToCurrentLoop(

base::Bind(&BufferNoLongerNeeded,