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

Commit 06682f94 authored by Neel Mehta's avatar Neel Mehta Committed by Android Git Automerger
Browse files

am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for... 

am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit '48bdf782':
  Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354
parents 6e2dd587 48bdf782

media/libstagefright/id3/ID3.cpp

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

        if (flags & 1) {

            // Strip data length indicator

            // Strip data length indicator





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

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

                return false;

                return false;

            }

            }

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

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