From: Edgar Pek <edgar.pek@gmail.com>
Date: Sat, 21 Feb 2015 13:56:41 +0000 (+0100)
Subject: Fix null-pointer dereference
X-Git-Tag: OpenSSL_1_0_2a~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98e6f0790111715877ffa1b08c93e44cc0b402e9;p=oweals%2Fopenssl.git

Fix null-pointer dereference

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit bcfa19a8d19506c26b5f8d9d9934ca2aa5f96b43)
---

diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index 2d6331d690..6f09ffb965 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -967,11 +967,11 @@ static int ubsec_dh_generate_key(DH *dh)
 
     if (dh->pub_key == NULL) {
         pub_key = BN_new();
+        if (pub_key == NULL)
+            goto err;
         pub_key_len = BN_num_bits(dh->p);
         if (bn_wexpand(pub_key, dh->p->top) == NULL)
             goto err;
-        if (pub_key == NULL)
-            goto err;
     } else {
         pub_key = dh->pub_key;
     }