media/filters/decrypting_demuxer_stream.cc - Issue 17422002: Encrypted Media: DecryptingXxx::SetDecryptor() accepts NULL decryptor.

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: media/filters/decrypting_demuxer_stream.cc

Issue 17422002: Encrypted Media: DecryptingXxx::SetDecryptor() accepts NULL decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add todo and bug. Created 7 years, 6 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:

Index: media/filters/decrypting_demuxer_stream.cc

diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc

index 77d769fe47d0a3d742d0512b0322797d84c322e8..b3485c9c4e876080f200d07165992fc646a48d71 100644

--- a/media/filters/decrypting_demuxer_stream.cc

+++ b/media/filters/decrypting_demuxer_stream.cc

@@ -136,6 +136,13 @@ void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {

DCHECK(!set_decryptor_ready_cb_.is_null());

set_decryptor_ready_cb_.Reset();

+ if (!decryptor) {

+ base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);

+ state_ = kUninitialized;

+ return;

+ }

decryptor_ = decryptor;

decryptor_->RegisterNewKeyCB(