Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1a854a0 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Fix integer overflow in mediadrmserver am: eb21712f 

am: 5250bc1b

Change-Id: Ic300845c6fd6aa383ee6661812e489f885ada14c
parents cfd6daa3 5250bc1b

drm/mediadrm/plugins/clearkey/InitDataParser.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ android::status_t InitDataParser::parsePssh(const Vector<uint8_t>& initData, 
    memcpy(&keyIdCount, &initData[readPosition], sizeof(keyIdCount));

    memcpy(&keyIdCount, &initData[readPosition], sizeof(keyIdCount));

    keyIdCount = ntohl(keyIdCount);

    keyIdCount = ntohl(keyIdCount);

    readPosition += sizeof(keyIdCount);

    readPosition += sizeof(keyIdCount);

    if (readPosition + (keyIdCount * kKeyIdSize) !=

    if (readPosition + ((uint64_t)keyIdCount * kKeyIdSize) !=

            initData.size() - sizeof(uint32_t)) {

            initData.size() - sizeof(uint32_t)) {

        return android::ERROR_DRM_CANNOT_HANDLE;

        return android::ERROR_DRM_CANNOT_HANDLE;

    }

    }