diff options
author | Kenny Root <kroot@android.com> | 2014-03-10 16:00:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-10 16:00:28 +0000 |
commit | 9ffe9be8dd27def3f674da90cf9619437e3d428c (patch) | |
tree | 367618447e48160efc1333e0b54ec48a52610a26 | |
parent | afd757283285c3859fcf00990b07d8f5a9e3ae02 (diff) | |
parent | c35d4eb3e66aa69ca17dd83b1bcdcc19276bf8e5 (diff) | |
download | security-idea133-weekly-release.tar.gz |
Merge "Fix the Vector erase bug"idea133-weekly-release
-rw-r--r-- | keystore/keystore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp index 987e3067..f7bdf3a2 100644 --- a/keystore/keystore.cpp +++ b/keystore/keystore.cpp @@ -880,14 +880,14 @@ public: 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 { |