summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorValerie Hau <vhau@google.com>2019-03-27 10:06:12 -0700
committerValerie Hau <vhau@google.com>2019-03-27 10:06:12 -0700
commitef77263b2f3b6040a0e04fed2434f673f99448fb (patch)
tree82c3207fc9377f1f172d87fda9085cf8f676f4e4 /graphics
parent17b3a4f60f9e853de05be9a6c7579459281e43bc (diff)
downloadandroid_hardware_interfaces-ef77263b2f3b6040a0e04fed2434f673f99448fb.tar.gz
android_hardware_interfaces-ef77263b2f3b6040a0e04fed2434f673f99448fb.tar.bz2
android_hardware_interfaces-ef77263b2f3b6040a0e04fed2434f673f99448fb.zip
Adding negative slot index check in ComposerResources
Bug: N/A Test: build, boot Change-Id: I8ab18ed8f7c322ee995abc534309b51e796276fe
Diffstat (limited to 'graphics')
-rw-r--r--graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h4
1 files 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 3a73f845e..1df496c06 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;