[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a939b0aab5deb3678308df804d25a340240deee5 (commit)
      from  47bbaa5b607f592009ed40f5678fde21c10a873c (commit)


- Log -----------------------------------------------------------------
commit a939b0aab5deb3678308df804d25a340240deee5
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 4 08:13:19 2015 -0400

    More zalloc nits
    
    Found on GitHub by dimman
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/evp/pmeth_lib.c | 1 -
 crypto/stack/stack.c   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index a2d8382..cff3dd2 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -180,7 +180,6 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
     ret->pkey = pkey;
     if (pkey)
         CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
-    ret->data = NULL;
 
     if (pmeth->init) {
         if (pmeth->init(ret) <= 0) {
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index e9d80a7..9d2d4f4 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -153,7 +153,7 @@ _STACK *sk_new(int (*c) (const void *, const void *))
 
     if ((ret = OPENSSL_zalloc(sizeof(_STACK))) == NULL)
         goto err;
-    if ((ret->data = OPENSSL_malloc(sizeof(*ret->data) * MIN_NODES)) == NULL)
+    if ((ret->data = OPENSSL_zalloc(sizeof(*ret->data) * MIN_NODES)) == NULL)
         goto err;
     ret->comp = c;
     ret->num_alloc = MIN_NODES;