From: xkernel <xkernel.wang@foxmail.com>
Date: Wed, 19 Oct 2022 16:40:25 +0000 (+0800)
Subject: Checking the return of BIO_new_fp(). If it returns NULL, then it is unnecessary to... 
X-Git-Tag: openssl-3.2.0-alpha1~1846
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb03e6145961005a6db011d2f36660d2eed734e2;p=thirdparty%2Fopenssl.git

Checking the return of BIO_new_fp(). If it returns NULL, then it is unnecessary to build the BIO chain and better make the caller directly return NULL

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19445)
---

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index b51afba8983..3d52e030ab7 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -2972,6 +2972,9 @@ BIO *dup_bio_out(int format)
                         BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
     void *prefix = NULL;
 
+    if (b == NULL)
+        return NULL;
+
 #ifdef OPENSSL_SYS_VMS
     if (FMT_istext(format))
         b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
@@ -2992,7 +2995,7 @@ BIO *dup_bio_err(int format)
                         BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
 
 #ifdef OPENSSL_SYS_VMS
-    if (FMT_istext(format))
+    if (b != NULL && FMT_istext(format))
         b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
 #endif
     return b;