commit 9e989ab695ffbc9bb4f5a41ebc13cfd61524f987
author George Burgess IV <gbiv@google.com> Fri Sep 01 18:27:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 01 18:27:57 2017 +0000
tree 7364595fb063a76429a4cf3c96053f86202c3b7c
parent 5e427fb4b71eeab023cc704c64c5bbce61c5f8a6
parent 6a7d20c2576dabdcfc0447c776a7d75688f8927d

Merge "Fix a mismatched malloc/delete" am: 619ac6c26b am: 05033f69eb am: 8616719671
am: 6a7d20c257

Change-Id: I97995297559feefed6a7cff79588d17c58d1efa5

keymaster_qcom.cpp

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 @@
         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;