commit 9ffe9be8dd27def3f674da90cf9619437e3d428c
author Kenny Root <kroot@android.com> Mon Mar 10 16:00:28 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 10 16:00:28 2014 +0000
tree 367618447e48160efc1333e0b54ec48a52610a26
parent afd757283285c3859fcf00990b07d8f5a9e3ae02
parent c35d4eb3e66aa69ca17dd83b1bcdcc19276bf8e5

Merge "Fix the Vector erase bug"

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 987e306..f7bdf3a 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -880,14 +880,14 @@
         for (android::Vector<grant_t*>::iterator it(mGrants.begin());
                 it != mGrants.end(); it++) {
             delete *it;
-            mGrants.erase(it);
         }
+        mGrants.clear();
 
         for (android::Vector<UserState*>::iterator it(mMasterKeys.begin());
                 it != mMasterKeys.end(); it++) {
             delete *it;
-            mMasterKeys.erase(it);
         }
+        mMasterKeys.clear();
     }
 
     keymaster_device_t* getDevice() const {