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

Commit 944706f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Prevent crash for malformed ID3 COMM frame"

parents 84404f06 e1e79172

media/libstagefright/id3/ID3.cpp

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

    size_t n = mFrameSize - getHeaderLength() - 1;

    if (otherdata) {

        if (n < 5) {

            return;

        }

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

        frameData += 4;

        int32_t i = n - 4;