commit 658e69585aadfd980322f5ab9c24054aa65a2ce1
author qctecmdr <qctecmdr@localhost> Tue Jul 28 05:55:50 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 28 05:55:50 2020 -0700
tree f247c68c97769adf9da87751954fbad389995ac8
parent 525eab21050c5eb7c44e30679ab74d538f267935
parent 43d661a1faa3ad693d02227744de653142d65859

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 872241a..6897288 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -1474,7 +1474,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
@@ -1651,7 +1651,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;
       }