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

Commit ed3f73e9 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix possible out of bounds read" into mnc-dev

parents 26e236bd 3762e061

media/libstagefright/id3/ID3.cpp

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

        // API wants number of characters, not number of bytes...

        int len = n / 2;

        if (len == 0) {

            return;

        }

        const char16_t *framedata = (const char16_t *) (frameData + 1);

        char16_t *framedatacopy = NULL;

        if (*framedata == 0xfffe) {