From 59a56c4cf02bbf1efeda6c2a5893d5079db78ff3 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 9 May 2016 21:52:11 +0200 Subject: [PATCH] Add NULL check in i2d_PrivateKey() Originally submitted by Kurt Cancemi Closes RT#4533 Reviewed-by: Matt Caswell --- crypto/asn1/i2d_pr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 7ca643fb58..15b428eec1 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -69,10 +69,13 @@ int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) } if (a->ameth && a->ameth->priv_encode) { PKCS8_PRIV_KEY_INFO *p8 = EVP_PKEY2PKCS8(a); - int ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp); - PKCS8_PRIV_KEY_INFO_free(p8); + int ret = 0; + if (p8 != NULL) { + ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp); + PKCS8_PRIV_KEY_INFO_free(p8); + } return ret; } ASN1err(ASN1_F_I2D_PRIVATEKEY, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE); - return (-1); + return -1; } -- 2.25.1