commit ef77263b2f3b6040a0e04fed2434f673f99448fb
author Valerie Hau <vhau@google.com> Wed Mar 27 10:06:12 2019 -0700
committer Valerie Hau <vhau@google.com> Wed Mar 27 10:06:12 2019 -0700
tree 82c3207fc9377f1f172d87fda9085cf8f676f4e4
parent 17b3a4f60f9e853de05be9a6c7579459281e43bc

Adding negative slot index check in ComposerResources

Bug: N/A
Test: build, boot
Change-Id: I8ab18ed8f7c322ee995abc534309b51e796276fe

graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h

diff --git a/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h b/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h
index 3a73f84..1df496c 100644
--- a/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h
+++ b/graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h
@@ -170,7 +170,7 @@
     }
 
     Error lookupCache(uint32_t slot, const native_handle_t** outHandle) {
-        if (slot < mHandles.size()) {
+        if (slot >= 0 && slot < mHandles.size()) {
             *outHandle = mHandles[slot];
             return Error::NONE;
         } else {
@@ -180,7 +180,7 @@
 
     Error updateCache(uint32_t slot, const native_handle_t* handle,
                       const native_handle** outReplacedHandle) {
-        if (slot < mHandles.size()) {
+        if (slot >= 0 && slot < mHandles.size()) {
             auto& cachedHandle = mHandles[slot];
             *outReplacedHandle = cachedHandle;
             cachedHandle = handle;