From fcb55c2109024ea5c44e35410be21e7371fa3cd0 Mon Sep 17 00:00:00 2001
From: Robb Kistler <code@robbkistler.com>
Date: Wed, 29 Jul 2015 21:18:54 -0700
Subject: [PATCH] Fix mem leaks in openssl_auth.cpp, nss_auth.cpp

Fix memory leaks in openssl_auth.cpp:s3fs_sha256hexsum and
nss_auth.cpp:s3fs_sha256hexsum.  Leaks occur every time a file
is created.
---
 src/nss_auth.cpp     |  1 +
 src/openssl_auth.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/nss_auth.cpp b/src/nss_auth.cpp
index 4fb11a5..b4a225b 100644
--- a/src/nss_auth.cpp
+++ b/src/nss_auth.cpp
@@ -263,6 +263,7 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
     }else if(-1 == bytes){
       // error
       DPRNNN("file read error(%d)", errno);
+      PK11_DestroyContext(sha256ctx, PR_TRUE);
       return NULL;
     }
     PK11_DigestOp(sha256ctx, buf, bytes);
diff --git a/src/openssl_auth.cpp b/src/openssl_auth.cpp
index 2fbe8a0..d4bc039 100644
--- a/src/openssl_auth.cpp
+++ b/src/openssl_auth.cpp
@@ -297,10 +297,8 @@ bool s3fs_sha256(const unsigned char* data, unsigned int datalen, unsigned char*
 
 unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 {
-  const EVP_MD* md        = EVP_get_digestbyname("sha256");
-  EVP_MD_CTX*   sha256ctx = EVP_MD_CTX_create();
-  EVP_DigestInit_ex(sha256ctx, md, NULL);
-
+  const EVP_MD*  md = EVP_get_digestbyname("sha256");
+  EVP_MD_CTX*    sha256ctx;
   char           buf[512];
   ssize_t        bytes;
   unsigned char* result;
@@ -318,6 +316,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
     return NULL;
   }
 
+  sha256ctx = EVP_MD_CTX_create();
+  EVP_DigestInit_ex(sha256ctx, md, NULL);
+
   memset(buf, 0, 512);
   for(ssize_t total = 0; total < size; total += bytes){
     bytes = 512 < (size - total) ? 512 : (size - total);
@@ -328,12 +329,14 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
     }else if(-1 == bytes){
       // error
       DPRNNN("file read error(%d)", errno);
+      EVP_MD_CTX_destroy(sha256ctx);
       return NULL;
     }
     EVP_DigestUpdate(sha256ctx, buf, bytes);
     memset(buf, 0, 512);
   }
   if(NULL == (result = (unsigned char*)malloc(get_sha256_digest_length()))){
+    EVP_MD_CTX_destroy(sha256ctx);
     return NULL;
   }
   EVP_DigestFinal_ex(sha256ctx, result, NULL);