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

Commit 6dc9a278 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 am: 26ac3132 

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



Change-Id: I6cbba4d42959e291a454d85fb7517643178d46cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 513cee7c 26ac3132

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) {