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

Commit 2e015190 authored by Roger1 Jonsson's avatar Roger1 Jonsson Committed by android-build-merger
Browse files

Merge "Prevent crash for malformed ID3 COMM frame" am: 944706f4 

am: 5c487ff3

Change-Id: I512b4df1b87f9be715896f418fd7618d3d234e82
parents 2384bfcc 5c487ff3

media/libstagefright/id3/ID3.cpp

+3 −0
Original line number Diff line number Diff line
@@ -534,6 +534,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;