Merge "Fix memory leak when GateKeeperProxy.verify() returns"

am: 855a643d3a

Change-Id: Ic6f852f970b60bc5b86da19ae050c78893fa8f94
This commit is contained in:
Kihyung Lee 2018-06-26 08:31:27 -07:00 committed by android-build-merger
commit 1729875503

View file

@ -235,11 +235,13 @@ public:
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,