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

Add Bounds Check to initDataResemblesPSSH am: ce01000c1b

Browse Source 
am: c48711d0ff

Change-Id: Ief842a2fa6ff75d1a4ef19a786a906ca7d56ebfb
This commit is contained in:
John W. Bruce
2017-06-30 01:14:42 +00:00
committed by android-build-merger
parent db365d4c16 c48711d0ff
commit d163479752
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -1008,6 +1008,11 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) {
bool WVDrmPlugin::initDataResemblesPSSH(const Vector<uint8_t>& initData) { bool WVDrmPlugin::initDataResemblesPSSH(const Vector<uint8_t>& initData) {
const uint8_t* const initDataArray = initData.array(); const uint8_t* const initDataArray = initData.array();
if (sizeof(uint32_t) + kPsshTag.size() > initData.size()) {
// The init data is so small that it couldn't contain a size and PSSH tag.
return false;
}
// Extract the size field // Extract the size field
const uint8_t* const sizeField = &initDataArray[0]; const uint8_t* const sizeField = &initDataArray[0];
uint32_t nboSize; uint32_t nboSize;

5
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -1316,6 +1316,11 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) {
bool WVDrmPlugin::initDataResemblesPSSH(const std::vector<uint8_t>& initData) { bool WVDrmPlugin::initDataResemblesPSSH(const std::vector<uint8_t>& initData) {
const uint8_t* const initDataArray = initData.data(); const uint8_t* const initDataArray = initData.data();
if (sizeof(uint32_t) + kPsshTag.size() > initData.size()) {
// The init data is so small that it couldn't contain a size and PSSH tag.
return false;
}
// Extract the size field // Extract the size field
const uint8_t* const sizeField = &initDataArray[0]; const uint8_t* const sizeField = &initDataArray[0];
uint32_t nboSize; uint32_t nboSize;