commit 13c04c27622c7be474e9368211795bcec052dedb
author Dan Stoza <stoza@google.com> Thu May 28 21:20:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 28 21:20:59 2015 +0000
tree c1b2acced08f5841787154e9863f1d1576b6bdc9
parent 20f7a6f004511486a2130030a4694ec2d2983c96
parent ae569747b632c2e04bddced4db969b11b5d72612

Merge "surfaceflinger: Fix range check for getFormat"

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 4e1b3ea..02c31ff 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -464,7 +464,7 @@
 }
 
 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;