From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 28 May 2015 14:44:20 +0000 (+0100)
Subject: check for error when creating PKCS#8 structure
X-Git-Tag: OpenSSL_1_0_1n~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc74177e715513e4050ee6e11c9f5fc3e8e65ad4;p=oweals%2Fopenssl.git

check for error when creating PKCS#8 structure

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc)
---

diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
index b98c76c4a9..5747c7366e 100644
--- a/crypto/pem/pem_pk8.c
+++ b/crypto/pem/pem_pk8.c
@@ -138,6 +138,8 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid,
         if (kstr == buf)
             OPENSSL_cleanse(buf, klen);
         PKCS8_PRIV_KEY_INFO_free(p8inf);
+        if (p8 == NULL)
+            return 0;
         if (isder)
             ret = i2d_PKCS8_bio(bp, p8);
         else