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

Commit 139ca758 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

CameraService: Bounds-check argument to playSound 

To ensure no out-of-bound array access is possible.

Test: Sounds still play when using API1
Bug: 181198806
Change-Id: Ibe42ce9addb70752d84785d50e1fd106ec84774c
parent a1335e1a

services/camera/libcameraservice/CameraService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,11 @@ void CameraService::playSound(sound_kind kind) { 
    ATRACE_CALL();



    LOG1("playSound(%d)", kind);

    if (kind < 0 || kind >= NUM_SOUNDS) {

        ALOGE("%s: Invalid sound id requested: %d", __FUNCTION__, kind);

        return;

    }



    Mutex::Autolock lock(mSoundLock);

    loadSoundLocked(kind);

    sp<MediaPlayer> player = mSoundPlayer[kind];