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

Commit a5333c00 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 

am: 8474c51a

Change-Id: I8a151eff3d02600134c929754c1420353f6a6ab1
parents 22386993 8474c51a

media/libstagefright/OMXCodec.cpp

+10 −2
Original line number Diff line number Diff line
@@ -3087,7 +3087,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;
@@ -3095,7 +3099,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);

        }