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

Commit c16c41bc authored by Neel Mehta's avatar Neel Mehta Committed by Android (Google) Code Review
Browse files

Merge "Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354"

parents 22e109b9 77e23413

media/libstagefright/id3/ID3.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ bool ID3::removeUnsynchronizationV2_4(bool iTunesHack) { 
        if (flags & 1) {

            // Strip data length indicator



            if (mSize < 14 || mSize - 14 < offset) {

            if (mSize < 14 || mSize - 14 < offset || dataSize < 4) {

                return false;

            }

            memmove(&mData[offset + 10], &mData[offset + 14], mSize - offset - 14);