commit a5273d9a57f33c7760e65119f82cad86a8cdd29c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 04 21:16:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 04 21:16:34 2019 +0000
tree a5b1a96c505f64112eb16de718eb5d7c28ce39af
parent 946f1d11c034b8ad5aa385c7c946c623f419404d
parent 8c4c1d6efbc83e19f7df59f7362664dbb72d891b

Merge "Fix memory leak in keystore"

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index c57012e..a28fd5f 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -933,9 +933,7 @@
 
     dev->finish(token, params.getParameters(), {}, signature, entropy,
                 [this, cb, token](OperationResult result_) {
-                    if (!result_.resultCode.isOk()) {
-                        mKeyStore->removeOperationDevice(token);
-                    }
+                    mKeyStore->removeOperationDevice(token);
                     cb->onFinished(result_);
                 });