diff options
| author | George Burgess IV <gbiv@google.com> | 2017-09-01 18:27:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-01 18:27:57 +0000 |
| commit | 9e989ab695ffbc9bb4f5a41ebc13cfd61524f987 (patch) | |
| tree | 7364595fb063a76429a4cf3c96053f86202c3b7c | |
| parent | 5e427fb4b71eeab023cc704c64c5bbce61c5f8a6 (diff) | |
| parent | 6a7d20c2576dabdcfc0447c776a7d75688f8927d (diff) | |
| download | keymaster-9e989ab695ffbc9bb4f5a41ebc13cfd61524f987.tar.gz | |
Merge "Fix a mismatched malloc/delete" am: 619ac6c26b am: 05033f69eb am: 8616719671
am: 6a7d20c257
Change-Id: I97995297559feefed6a7cff79588d17c58d1efa5
| -rw-r--r-- | keymaster_qcom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index b7ec9ce..0ad3330 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp @@ -172,13 +172,13 @@ static int qcom_km_get_keypair_public(const keymaster0_device_t* dev, return -1; } - UniquePtr<uint8_t> key(static_cast<uint8_t*>(malloc(len))); + UniquePtr<unsigned char[]> key(new unsigned char[len]); if (key.get() == NULL) { ALOGE("Could not allocate memory for public key data"); return -1; } - unsigned char* tmp = reinterpret_cast<unsigned char*>(key.get()); + unsigned char* tmp = key.get(); if (i2d_PUBKEY(pkey.get(), &tmp) != len) { ALOGE("Len 2 returned is < 0 len = %d", len); return -1; |