diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 05:24:23 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 05:24:23 +0000 |
| commit | 26b20010fb72dfa2093681b08184033e9b340c41 (patch) | |
| tree | 10d91e0820fd79d8ab678718dab99e956a6b7c30 /webkit/media | |
| parent | 4038a13d4bc51d5bca8d91443c1cf0952a7fcddf (diff) | |
| download | chromium_src-26b20010fb72dfa2093681b08184033e9b340c41.zip chromium_src-26b20010fb72dfa2093681b08184033e9b340c41.tar.gz chromium_src-26b20010fb72dfa2093681b08184033e9b340c41.tar.bz2 | |
Allow a null initData for external CDMs.
initData is only necessary for Clear Key, which handles null correctly in AesDecryptor.
Review URL: https://chromiumcodereview.appspot.com/12079060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/ppapi/cdm_wrapper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc index 4385f51..9c7fa56 100644 --- a/webkit/media/crypto/ppapi/cdm_wrapper.cc +++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc @@ -660,8 +660,9 @@ void CdmWrapper::AddKey(const std::string& session_id, int key_size = key.ByteLength(); const uint8_t* init_data_ptr = static_cast<const uint8_t*>(init_data.Map()); int init_data_size = init_data.ByteLength(); + PP_DCHECK(!init_data_ptr == !init_data_size); - if (!key_ptr || key_size <= 0 || !init_data_ptr || init_data_size <= 0) { + if (!key_ptr || key_size <= 0) { SendUnknownKeyError(key_system_, session_id); return; } |