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

Commit 26ac3132 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding extra checks to bound linear block sizes" into main am: 3698d67d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2976057



Change-Id: Ief3dfde143c42d6bd2caf9ac13aec67aaed15c67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6395777 3698d67d

media/jni/android_media_MediaCodec.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2895,6 +2895,10 @@ static void extractBufferFromContext( 
        jint offset,

        jint size,

        std::shared_ptr<C2Buffer> *buffer) {

    if ((offset + size) > context->capacity()) {

        ALOGW("extractBufferFromContext: offset + size provided exceed capacity");

        return;

    }

    *buffer = context->toC2Buffer(offset, size);

    if (*buffer == nullptr) {

        if (!context->mMemory) {