commit 3b1c8dc4013ae3d9c47933dd27a02b72ecfe3814
author qctecmdr <qctecmdr@localhost> Mon Aug 17 10:21:05 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 17 10:21:05 2020 -0700
tree 03d7ede8e2d43411366ef1feff7f57e87e84d85b
parent cb4779e27ebf4a5cb1c7f26c884600b7a3efc6aa
parent 2a4ae300e5bbe1d76e35606862fb4ebafd5dfaff

Merge "gralloc: Fix array out of bound"

gralloc/gr_buf_mgr.cpp

diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index e78ba2e..7e9f57f 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -1423,7 +1423,7 @@
   // Reset to false for special cases below
   if (IS_VENDOR_METADATA_TYPE(metadatatype_value)) {
     metadata->isVendorMetadataSet[GET_VENDOR_METADATA_STATUS_INDEX(metadatatype_value)] = true;
-  } else {
+  } else if (GET_STANDARD_METADATA_STATUS_INDEX(metadatatype_value) < METADATA_SET_SIZE) {
     metadata->isStandardMetadataSet[GET_STANDARD_METADATA_STATUS_INDEX(metadatatype_value)] = true;
   }
 #endif
@@ -1600,7 +1600,7 @@
 #ifdef METADATA_V2
       if (IS_VENDOR_METADATA_TYPE(metadatatype_value)) {
         metadata->isVendorMetadataSet[GET_VENDOR_METADATA_STATUS_INDEX(metadatatype_value)] = false;
-      } else {
+      } else if (GET_STANDARD_METADATA_STATUS_INDEX(metadatatype_value) < METADATA_SET_SIZE) {
         metadata->isStandardMetadataSet[GET_STANDARD_METADATA_STATUS_INDEX(metadatatype_value)] =
             false;
       }