From 918bb8652969fd53f0c390c1cd909265ed502c7e Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Wed, 4 Mar 2015 17:49:51 +0000
Subject: Unchecked malloc fixes

Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
paths as I spotted them along the way.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---
 crypto/dh/dh_pmeth.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'crypto/dh')

diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index c41de925c7..8975f4492a 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -468,6 +468,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
         ret = 0;
         Zlen = DH_size(dh);
         Z = OPENSSL_malloc(Zlen);
+        if(!Z) {
+            goto err;
+        }
         if (DH_compute_key_padded(Z, dhpub, dh) <= 0)
             goto err;
         if (!DH_KDF_X9_42(key, *keylen, Z, Zlen, dctx->kdf_oid,
-- 
cgit v1.2.3