[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  4348995b0d818203f37ffa51c9bdf4488cf24bad (commit)
      from  385deae79f26dd685339d3141a06d04d6bd753cd (commit)


- Log -----------------------------------------------------------------
commit 4348995b0d818203f37ffa51c9bdf4488cf24bad
Author: luxinyou <luxinyou at uniontech.com>
Date:   Mon Sep 7 18:06:45 2020 +1000

    Fix memory leaks in conf_def.c
    
    Fixes #12471
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12533)

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

Summary of changes:
 crypto/conf/conf_def.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 1d34519d1a..5475429abd 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -442,11 +442,13 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                     if (biosk == NULL) {
                         if ((biosk = sk_BIO_new_null()) == NULL) {
                             CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
+                            BIO_free(next);
                             goto err;
                         }
                     }
                     if (!sk_BIO_push(biosk, in)) {
                         CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
+                        BIO_free(next);
                         goto err;
                     }
                     /* continue with reading from the included BIO */