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

Commit 5d05c38d authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

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

[automerger] Check NAL size before looking inside am: e0c02096 am: 8c4ae805 am: 767a82a9 am: f7d9bba9 am: e04b7c8c am: 25e199f7 am: 93962ef5 am: 714148f6 am: b6fdd7ee am: 3631c04d am: 68adda01 am: 68e58ff3 am: 078f1de7
am: a1f05a71

Change-Id: Ieefec18019f6c43214a108b0a86adc4962163a77
parents 6d0b7083 a1f05a71

media/libstagefright/avc_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,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;