From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 28 Jun 2021 15:09:08 +0000 (+0200)
Subject: coverity #1486531: return error properly from x509_pubkey_ex_new_ex()
X-Git-Tag: openssl-3.0.0-beta2~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=475c5bbd1091717411d67b8662320a1b0a8c9e42;p=thirdparty%2Fopenssl.git

coverity #1486531: return error properly from x509_pubkey_ex_new_ex()

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15942)
---

diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index b20b756e9a5..0c07c39a1f2 100644
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -116,6 +116,7 @@ static int x509_pubkey_ex_new_ex(ASN1_VALUE **pval, const ASN1_ITEM *it,
         || !x509_pubkey_ex_populate((ASN1_VALUE **)&ret, NULL)
         || !x509_pubkey_set0_libctx(ret, libctx, propq)) {
         x509_pubkey_ex_free((ASN1_VALUE **)&ret, NULL);
+        ret = NULL;
         ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE);
     } else {
         *pval = (ASN1_VALUE *)ret;