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

Commit 8474c51a authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Don't CHECK when buffer is too large am: c2f0c73b am: acb7186e 

am: 0a4db601

Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2
parents a9660fe1 0a4db601

media/libstagefright/OMXCodec.cpp

+10 −2
Original line number Diff line number Diff line
@@ -3085,7 +3085,11 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { 
            static const uint8_t kNALStartCode[4] =

                    { 0x00, 0x00, 0x00, 0x01 };



            CHECK(info->mSize >= specific->mSize + 4);

            if (info->mSize < specific->mSize + 4) {

                ALOGE("info size %zu < specific size %zu", info->mSize, specific->mSize + 4);

                setState(ERROR);

                return false;

            }



            size += 4;
@@ -3093,7 +3097,11 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { 
            memcpy((uint8_t *)info->mData + 4,

                   specific->mData, specific->mSize);

        } else {

            CHECK(info->mSize >= specific->mSize);

            if (info->mSize < specific->mSize) {

                ALOGE("info size %zu < specific size %zu", info->mSize, specific->mSize);

                setState(ERROR);

                return false;

            }

            memcpy(info->mData, specific->mData, specific->mSize);

        }