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

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

am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size... 

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

* commit '43131299':
  libstagefright: check remaining data size before parsing it.
parents 9359e822 43131299

media/libstagefright/id3/ID3.cpp

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

    }



    if (mFrameSize < getHeaderLength() + 1) {

        return;

    }

    size_t n = mFrameSize - getHeaderLength() - 1;

    if (otherdata) {

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