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

Commit edce8ad0 authored by Sergio Giro's avatar Sergio Giro Committed by android-build-merger
Browse files

DO NOT MERGE Add bound checks to utf16_to_utf8 

am: 0d9d569c

Change-Id: Ic54078ce7eed59b04e6e4862bf2daf2aa0185950
parents 8635613b 0d9d569c

media/libmediaplayerservice/MediaPlayerService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ void unmarshallAudioAttributes(const Parcel& parcel, audio_attributes_t *attribu 
            // copying array size -1, array for tags was calloc'd, no need to NULL-terminate it

            size_t tagSize = realTagSize > AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 ?

                    AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 : realTagSize;

            utf16_to_utf8(tags.string(), tagSize, attributes->tags);

            utf16_to_utf8(tags.string(), tagSize, attributes->tags,

                    sizeof(attributes->tags) / sizeof(attributes->tags[0]));

        }

    } else {

        ALOGE("unmarshallAudioAttributes() received unflattened tags, ignoring tag values");