widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere

Browse Source 
* commit 'bcf3a11f0fe87ef7b56c374ed89b91ed8a17f44b':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in:
Jeff Tinker
2015-08-21 15:46:33 +00:00
committed by Android Git Automerger
parent f934d6fb41 bcf3a11f0f
commit cee546e501
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -647,6 +647,10 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
buffer_descriptor.type =
params.is_secure ? destination_buffer_type_ : OEMCrypto_BufferType_Clear;
if (params.is_secure && buffer_descriptor.type == OEMCrypto_BufferType_Clear) {
return SECURE_BUFFER_REQUIRED;
}
switch (buffer_descriptor.type) {
case OEMCrypto_BufferType_Clear:
buffer_descriptor.buffer.clear.address =