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

Commit 4e3e30c2 authored by Ajay Dudani's avatar Ajay Dudani Committed by Patrick Tjin
Browse files

surfaceflinger: Fix range check for getFormat 

Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.

Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
parent cbe13ef5

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ sp<Fence> HWComposer::getDisplayFence(int disp) const { 
}



uint32_t HWComposer::getFormat(int disp) const {

    if (uint32_t(disp)>31 || !mAllocatedDisplayIDs.hasBit(disp)) {

    if (static_cast<uint32_t>(disp) >= MAX_HWC_DISPLAYS || !mAllocatedDisplayIDs.hasBit(disp)) {

        return HAL_PIXEL_FORMAT_RGBA_8888;

    } else {

        return mDisplayData[disp].format;