commit 1b3049e56c4910bc4417dac810e563fc52f6bbb6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 27 22:31:39 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 22:31:39 2019 +0000
tree f6c1a942fadf4bd4dfd1d8b4e553da777545c485
parent 300fc770e93e03c9af61b2ffdbc18c4cf90981f1
parent ef77263b2f3b6040a0e04fed2434f673f99448fb

Merge "Adding negative slot index check in ComposerResources"

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;