ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701

Browse source 
Change-Id: I25e3d526bb3f09c826d204909ea1763af4eb951d
This commit is contained in:
Android Build Merger (Role) 2019-06-20 22:31:15 +00:00
commit e126026c02
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gatekeeperd/SoftGateKeeper.h
View file

@ -58,23 +58,16 @@ public:
virtual ~SoftGateKeeper() { virtual ~SoftGateKeeper() {
} }
virtual bool GetAuthTokenKey(const uint8_t **auth_token_key, virtual bool GetAuthTokenKey(const uint8_t** auth_token_key, uint32_t* length) const {
uint32_t *length) const {
if (auth_token_key == NULL || length == NULL) return false; if (auth_token_key == NULL || length == NULL) return false;
uint8_t *auth_token_key_copy = new uint8_t[SIGNATURE_LENGTH_BYTES]; *auth_token_key = key_.get();
memcpy(auth_token_key_copy, key_.get(), SIGNATURE_LENGTH_BYTES);
*auth_token_key = auth_token_key_copy;
*length = SIGNATURE_LENGTH_BYTES; *length = SIGNATURE_LENGTH_BYTES;
return true; return true;
} }
virtual void GetPasswordKey(const uint8_t **password_key, uint32_t *length) { virtual void GetPasswordKey(const uint8_t** password_key, uint32_t* length) {
if (password_key == NULL || length == NULL) return; if (password_key == NULL || length == NULL) return;
uint8_t *password_key_copy = new uint8_t[SIGNATURE_LENGTH_BYTES]; *password_key = key_.get();
memcpy(password_key_copy, key_.get(), SIGNATURE_LENGTH_BYTES);
*password_key = password_key_copy;
*length = SIGNATURE_LENGTH_BYTES; *length = SIGNATURE_LENGTH_BYTES;
} }