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

Commit a991d0db authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev"... 

Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev am: 91abb3da am: 767b86ff am: ee82a4b0
am: 5daa75a9

Change-Id: Ia5163e22efdcd9c65a72d165d7ba1ecb270b9524
parents 7ccec456 5daa75a9

media/libstagefright/id3/ID3.cpp

+3 −0
Original line number Diff line number Diff line
@@ -607,6 +607,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) {