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

Commit d2b12629 authored by Ray Essick's avatar Ray Essick
Browse files

even better error handling in id3 tag parsing. 

This better handles some of the error cases, particularly
when the 'new' operations fail.

Bug: 30744884
Change-Id: Idbc1fd4aef1ee6cc2736057ff09bf870d8fb5da3
parent c54432ae

media/libstagefright/id3/ID3.cpp

+32 −18
Original line number Diff line number Diff line
@@ -545,6 +545,10 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
        n -= skipped;

    }



    if (n <= 0) {

       return;

    }



    if (encoding == 0x00) {

        // supposedly ISO 8859-1

        id->setTo((const char*)frameData + 1, n);
@@ -560,13 +564,14 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
#if BYTE_ORDER == LITTLE_ENDIAN

        if (len > 0) {

            framedatacopy = new (std::nothrow) char16_t[len];

            if (framedatacopy != NULL) {

            if (framedatacopy == NULL) {

                return;

            }

            for (int i = 0; i < len; i++) {

                framedatacopy[i] = bswap_16(framedata[i]);

            }

            framedata = framedatacopy;

        }

        }

#endif

        id->setTo(framedata, len);

        if (framedatacopy != NULL) {
@@ -579,19 +584,26 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
        const char16_t *framedata = (const char16_t *) (frameData + 1);

        char16_t *framedatacopy = NULL;

        if (*framedata == 0xfffe) {

            // endianness marker doesn't match host endianness, convert

            if (len > 0) {

            // endianness marker != host endianness, convert & skip

            if (len <= 1) {

                return;         // nothing after the marker

            }

            framedatacopy = new (std::nothrow) char16_t[len];

                if (framedatacopy != NULL) {

            if (framedatacopy == NULL) {

                return;

            }

            for (int i = 0; i < len; i++) {

                framedatacopy[i] = bswap_16(framedata[i]);

            }

            framedata = framedatacopy;

            // and skip over the marker

            framedata++;

            len--;

        } else if (*framedata == 0xfeff) {

            // endianness marker == host endianness, skip it

            if (len <= 1) {

                return;         // nothing after the marker

            }

            }

        }

        // If the string starts with an endianness marker, skip it

        if (*framedata == 0xfeff) {

            framedata++;

            len--;

        }
@@ -604,7 +616,7 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
                break;

            }

        }

        if (eightBit && len > 0) {

        if (eightBit) {

            // collapse to 8 bit, then let the media scanner client figure out the real encoding

            char *frame8 = new (std::nothrow) char[len];

            if (frame8 != NULL) {
@@ -613,6 +625,8 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const { 
                }

                id->setTo(frame8, len);

                delete [] frame8;

            } else {

                id->setTo(framedata, len);

            }

        } else {

            id->setTo(framedata, len);