[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  d580c2790f9f304533a3eda2a9cf6b8eb22830c3 (commit)
      from  f5485b97b6c9977c0d39c7669b9f97a879312447 (commit)


- Log -----------------------------------------------------------------
commit d580c2790f9f304533a3eda2a9cf6b8eb22830c3
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Tue Dec 7 17:49:05 2021 +0100

    OSSL_CMP_MSG_read(): Fix mem leak on file read error
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17225)

-----------------------------------------------------------------------

Summary of changes:
 crypto/cmp/cmp_msg.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 51b0998bdc..0497155e09 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -1100,9 +1100,8 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
         return NULL;
     }
 
-    if ((bio = BIO_new_file(file, "rb")) == NULL)
-        return NULL;
-    if (d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
+    if ((bio = BIO_new_file(file, "rb")) == NULL
+            || d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
         OSSL_CMP_MSG_free(msg);
         msg = NULL;
     }