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

Merge "Set max output buffer size in Mod Mock"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2019-02-21 22:30:46 +00:00
committed by Android (Google) Code Review
parent 36e845d00d 4389e262d1
commit d925048c35
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp
View File

@@ -215,6 +215,13 @@ OEMCryptoResult CryptoEngine::SetDestination(
default: default:
return OEMCrypto_ERROR_INVALID_CONTEXT; return OEMCrypto_ERROR_INVALID_CONTEXT;
} }
size_t max_allowed = max_output_size();
if (max_allowed > 0 &&
(max_allowed < max_length || max_allowed < data_length)) {
LOGE("Output too large (or buffer too small).");
return OEMCrypto_ERROR_OUTPUT_TOO_LARGE;
}
if (out_description->type != OEMCrypto_BufferType_Direct && if (out_description->type != OEMCrypto_BufferType_Direct &&
max_length < data_length) { max_length < data_length) {
LOGE("[SetDestination(): OEMCrypto_ERROR_SHORT_BUFFER]"); LOGE("[SetDestination(): OEMCrypto_ERROR_SHORT_BUFFER]");

5
libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h
View File

@@ -150,6 +150,11 @@ class CryptoEngine {
// This is the same as the max subsample size, not the sample or frame size. // This is the same as the max subsample size, not the sample or frame size.
virtual size_t max_buffer_size() { return 1024 * 100; } // 100 KiB. virtual size_t max_buffer_size() { return 1024 * 100; } // 100 KiB.
// If 0 no restriction, otherwise it's the max output buffer for DecryptCENC
// and CopyBuffer. This is the same as the max frame or sample size, not the
// subsample size.
virtual size_t max_output_size() { return 0; }
virtual bool srm_update_supported() { return false; } virtual bool srm_update_supported() { return false; }
virtual OEMCryptoResult current_srm_version(uint16_t* version) { virtual OEMCryptoResult current_srm_version(uint16_t* version) {