[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d65c3615f6c658478503f4862f8055203a98038c (commit)
      from  01c09f9fde5793e0b3712d602b02e2aed4908e8d (commit)


- Log -----------------------------------------------------------------
commit d65c3615f6c658478503f4862f8055203a98038c
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date:   Wed Sep 7 09:41:20 2016 -0400

    GH1537: Avoid double-free in the EVP_PKEY API
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/evp/p_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index a4dcf58..9828620 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -398,6 +398,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
         return;
     REF_ASSERT_ISNT(i < 0);
     EVP_PKEY_free_it(x);
+    CRYPTO_THREAD_lock_free(x->lock);
     sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
     OPENSSL_free(x);
 }
@@ -413,7 +414,6 @@ static void EVP_PKEY_free_it(EVP_PKEY *x)
     ENGINE_finish(x->engine);
     x->engine = NULL;
 #endif
-    CRYPTO_THREAD_lock_free(x->lock);
 }
 
 static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,