From ef77263b2f3b6040a0e04fed2434f673f99448fb Mon Sep 17 00:00:00 2001 From: Valerie Hau Date: Wed, 27 Mar 2019 10:06:12 -0700 Subject: [PATCH] Adding negative slot index check in ComposerResources Bug: N/A Test: build, boot Change-Id: I8ab18ed8f7c322ee995abc534309b51e796276fe --- .../utils/hal/include/composer-hal/2.1/ComposerResources.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3a73f845e4..1df496c065 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 @@ class ComposerHandleCache { } 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 @@ class ComposerHandleCache { 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;