diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-03-27 22:31:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-27 22:31:39 +0000 |
| commit | 1b3049e56c4910bc4417dac810e563fc52f6bbb6 (patch) | |
| tree | f6c1a942fadf4bd4dfd1d8b4e553da777545c485 | |
| parent | 300fc770e93e03c9af61b2ffdbc18c4cf90981f1 (diff) | |
| parent | ef77263b2f3b6040a0e04fed2434f673f99448fb (diff) | |
Merge "Adding negative slot index check in ComposerResources"
| -rw-r--r-- | graphics/composer/2.1/utils/hal/include/composer-hal/2.1/ComposerResources.h | 4 |
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 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; |