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

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

Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev 

am: bea67b8a

Change-Id: I4281c4eabbabc991f2fa5d1052d30194dfacc630
parents f517d276 bea67b8a

media/libmediaplayerservice/MediaPlayerService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,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");