Add Bounds Check to initDataResemblesPSSH am: ce01000c1b

am: c48711d0ff Change-Id: Ief842a2fa6ff75d1a4ef19a786a906ca7d56ebfb
2017-06-30 01:14:42 +00:00
parent db365d4c16 c48711d0ff
commit d163479752
2 changed files with 10 additions and 0 deletions
--- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
@@ -1316,6 +1316,11 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) {
 bool WVDrmPlugin::initDataResemblesPSSH(const std::vector<uint8_t>& initData) {
  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
  const uint8_t* const sizeField = &initDataArray[0];
  uint32_t nboSize;