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

Commit 61df392e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [10297641, 10298303, 10298494, 10298514, 10297196,... 

Merge cherrypicks of [10297641, 10298303, 10298494, 10298514, 10297196, 10298164, 10297642, 10297643, 10296046, 10296047, 10298245, 10298246, 10297197, 10297198, 10298495, 10298496] into qt-qpr2-release

Change-Id: I5ee541576fb58dfb37fb25b9c7982c941c3cf005
parents a66592bf bcd4eaae

drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ Return<void> CryptoPlugin::decrypt_1_2( 
        return Void();

    }



    base = static_cast<uint8_t *>(static_cast<void *>(destBase->getPointer()));



    if (destBuffer.offset + destBuffer.size > destBase->getSize()) {

        _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size");

        return Void();

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+6 −0
Original line number Diff line number Diff line
@@ -818,6 +818,12 @@ Return<Status> DrmPlugin::releaseSecureStops(const SecureStopRelease& ssRelease) 
    // and the drm service. The clearkey implementation consists of:

    //    count - number of secure stops

    //    list of fixed length secure stops

    size_t countBufferSize = sizeof(uint32_t);

    if (input.size() < countBufferSize) {

        // SafetyNet logging

        android_errorWriteLog(0x534e4554, "144766455");

        return Status::BAD_VALUE;

    }

    uint32_t count = 0;

    sscanf(reinterpret_cast<char*>(input.data()), "%04" PRIu32, &count);