From: Rich Salz <rsalz@akamai.com>
Date: Fri, 4 Sep 2015 12:13:19 +0000 (-0400)
Subject: More zalloc nits
X-Git-Tag: OpenSSL_1_1_0-pre1~719
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a939b0aab5deb3678308df804d25a340240deee5;p=oweals%2Fopenssl.git

More zalloc nits

Found on GitHub by dimman

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index a2d8382de3..cff3dd245a 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 e9d80a72db..9d2d4f4658 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;