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

Commit 767a82a9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Check NAL size before looking inside am: e0c02096 am: 8c4ae805 

Change-Id: I62c49aaaae1a483b0f74988a52c8b3995e081683
parents a896e5b7 8c4ae805

media/libstagefright/avc_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static sp<ABuffer> FindNAL(const uint8_t *data, size_t size, unsigned nalType) { 
    const uint8_t *nalStart;

    size_t nalSize;

    while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) {

        if ((nalStart[0] & 0x1f) == nalType) {

        if (nalSize > 0 && (nalStart[0] & 0x1f) == nalType) {

            sp<ABuffer> buffer = new ABuffer(nalSize);

            memcpy(buffer->data(), nalStart, nalSize);

            return buffer;