commit 3978e62d16b653cb60e40a9bc1330d908f72d800
author Kihyung Lee <kihyung2.lee@lge.com> Tue Jun 26 08:31:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 26 08:31:27 2018 -0700
tree 0de99324880b47811a85840874e0d548b2f69300
parent b1627493f3f58c427419e906133a016921b48857
parent 48edb8e3ce7e60a6a2ff9395095c11bb6b0731b7

Merge "Fix memory leak when GateKeeperProxy.verify() returns"
am: 855a643d3a

Change-Id: Ic6f852f970b60bc5b86da19ae050c78893fa8f94

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 5781765..5f3ce36 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -235,11 +235,13 @@
     virtual int verify(uint32_t uid,
             const uint8_t *enrolled_password_handle, uint32_t enrolled_password_handle_length,
             const uint8_t *provided_password, uint32_t provided_password_length, bool *request_reenroll) {
-        uint8_t *auth_token;
+        uint8_t *auth_token = nullptr;
         uint32_t auth_token_length;
-        return verifyChallenge(uid, 0, enrolled_password_handle, enrolled_password_handle_length,
+        int ret = verifyChallenge(uid, 0, enrolled_password_handle, enrolled_password_handle_length,
                 provided_password, provided_password_length,
                 &auth_token, &auth_token_length, request_reenroll);
+        delete [] auth_token;
+        return ret;
     }
 
     virtual int verifyChallenge(uint32_t uid, uint64_t challenge,