[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_2-stable has been updated
       via  5ecb5467b6960ab41b8f8b45f9380fcba74c3ed8 (commit)
      from  373a56139f910c3ef08f6df2d48ad954a5c3a0f4 (commit)


- Log -----------------------------------------------------------------
commit 5ecb5467b6960ab41b8f8b45f9380fcba74c3ed8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Sep 8 15:10:32 2016 +0100

    Fix memory leak on error.
    
    Backport leak fix from master branch.
    
    Thanks to Shi Lei for reporting this bug.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509spki.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c
index 2df84ea..5ae5d30 100644
--- a/crypto/x509/x509spki.c
+++ b/crypto/x509/x509spki.c
@@ -112,6 +112,8 @@ char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
     der_spki = OPENSSL_malloc(der_len);
     b64_str = OPENSSL_malloc(der_len * 2);
     if (!der_spki || !b64_str) {
+        OPENSSL_free(der_spki);
+        OPENSSL_free(b64_str);
         X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
         return NULL;
     }