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

Commit 4d7023dd authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Fix id3 parser crash" 

 * Causing CTS failure. Revert for now.

This reverts commit a6ab7f8b.

Change-Id: I9f372964a50fefe05cd23d3eabe5bdaf00ef6b17
parent a6ab7f8b

media/libstagefright/id3/ID3.cpp

+2 −9
Original line number Diff line number Diff line
@@ -630,10 +630,7 @@ void ID3::Iterator::findFrame() { 
                | (mParent.mData[mOffset + 4] << 8)

                | mParent.mData[mOffset + 5];



            if (mFrameSize == 0) {

                return;

            }

            mFrameSize += 6; // add tag id and size field

            mFrameSize += 6;



            if (mOffset + mFrameSize > mParent.mSize) {

                ALOGV("partial frame at offset %zu (size = %zu, bytes-remaining = %zu)",
@@ -674,11 +671,7 @@ void ID3::Iterator::findFrame() { 
                baseSize = U32_AT(&mParent.mData[mOffset + 4]);

            }



            if (baseSize == 0) {

                return;

            }



            mFrameSize = 10 + baseSize; // add tag id, size field and flags

            mFrameSize = 10 + baseSize;



            if (mOffset + mFrameSize > mParent.mSize) {

                ALOGV("partial frame at offset %zu (size = %zu, bytes-remaining = %zu)",