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

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: Created 5 years, 1 month 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/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index da08f75c6013c27e5bdafe05a8d35d46d3002808..777a919d315eddc51b2a6c54d8626ee52ae626a5 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -1039,6 +1039,12 @@ void ContentDecryptorDelegate::DeliverFrame(
frame_data + frame_info->plane_offsets[PP_DECRYPTEDFRAMEPLANES_V],
base::TimeDelta::FromMicroseconds(
frame_info->tracking_info.timestamp));
+ if (!decoded_frame) {
+ DLOG(ERROR) << "Couldn't create video frame";
+ FreeBuffer(frame_info->tracking_info.buffer_id);
+ video_decode_cb.Run(Decryptor::kError, NULL);
+ return;
+ }
decoded_frame->AddDestructionObserver(
media::BindToCurrentLoop(
base::Bind(&BufferNoLongerNeeded,

Powered by Google App Engine
This is Rietveld 408576698