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

Commit 91fc84f2 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining... 

am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit 'de5c4c46':
  libstagefright: check remaining data size before parsing it.
parents 0bf31aeb de5c4c46

media/libstagefright/id3/ID3.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -509,6 +509,9 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
        return;

        return;

    }

    }





    if (mFrameSize < getHeaderLength() + 1) {

        return;

    }

    size_t n = mFrameSize - getHeaderLength() - 1;

    size_t n = mFrameSize - getHeaderLength() - 1;

    if (otherdata) {

    if (otherdata) {

        // skip past the encoding, language, and the 0 separator

        // skip past the encoding, language, and the 0 separator