commit a9ea31e93c425ed41179ac48ec5ea43eae1b7107
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 29 18:52:33 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 29 18:52:33 2019 +0000
tree 06346dc7514afef49ceea2cd4afab6f66d02e39c
parent dd1492e588ee03b884dc1919de1ef85676c78ab7
parent 1662667c75fe3349de2eb0611f7a326580260f76

Merge "memset_s based on capacity rather than size"

android_keymaster/authorization_set.cpp

diff --git a/android_keymaster/authorization_set.cpp b/android_keymaster/authorization_set.cpp
index ee71c0e..93a04c3 100644
--- a/android_keymaster/authorization_set.cpp
+++ b/android_keymaster/authorization_set.cpp
@@ -511,8 +511,8 @@
 }
 
 void AuthorizationSet::Clear() {
-    memset_s(elems_, 0, elems_size_ * sizeof(keymaster_key_param_t));
-    memset_s(indirect_data_, 0, indirect_data_size_);
+    memset_s(elems_, 0, elems_capacity_ * sizeof(keymaster_key_param_t));
+    memset_s(indirect_data_, 0, indirect_data_capacity_);
     elems_size_ = 0;
     indirect_data_size_ = 0;
     error_ = OK;