commit b251de0a9bbfd0d39e90a214657d7fcb79b76e21
author Thurston Dang <thurston@google.com> Wed Jul 20 00:32:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 20 00:32:01 2016 +0000
tree 75a9c544565b71e156ce8297ed437571ec848ee2
parent 949969689f1b8ae4b27eb58f68b5083f58bc5dd7
parent 06dc31181752c3e59b4c5b58b24f023640898564

Merge "Call EVP_CIPHER_CTX_cleanup to avoid leaking memory that was allocated in EVP_DecryptInit_ex"

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 0334bbd..6dd56cb 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1409,6 +1409,8 @@
       SLOGE("encrypt_master_key: crypto_scrypt failed");
     }
 
+    EVP_CIPHER_CTX_cleanup(&e_ctx);
+
     return 0;
 }
 
@@ -1458,6 +1460,8 @@
     }
   }
 
+  EVP_CIPHER_CTX_cleanup(&d_ctx);
+
   return 0;
 }