Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec

am: d1a854a073 Change-Id: I212669c64a748fed506b8b4a90a568aa91d01787
7 years ago · 7a22df06c3
parent 98a4729522 d1a854a073
commit 7a22df06c3
1 changed files with 1 additions and 1 deletions
--- a/drm/mediadrm/plugins/clearkey/InitDataParser.cpp
+++ b/drm/mediadrm/plugins/clearkey/InitDataParser.cpp
@ -109,7 +109,7 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData,
    memcpy(&keyIdCount, &initData[readPosition], sizeof(keyIdCount));
    keyIdCount = ntohl(keyIdCount);
    readPosition += sizeof(keyIdCount);
-    if (readPosition + (keyIdCount * kKeyIdSize) !=
+    if (readPosition + ((uint64_t)keyIdCount * kKeyIdSize) !=
            initData.size() - sizeof(uint32_t)) {
        return android::ERROR_DRM_CANNOT_HANDLE;
    }