[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  68b78dd7e40f57064b0f24728d8b544fe583599c (commit)
      from  08dfbe0798f57ac9e9793fdfcaff54cfdf6b3359 (commit)


- Log -----------------------------------------------------------------
commit 68b78dd7e40f57064b0f24728d8b544fe583599c
Author: ABautkin <A.Bautkin at aladdin-rd.ru>
Date:   Thu Dec 16 15:59:14 2021 +0300

    Fix deref after null
    
    ctx may be NULL at 178 line
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17293)

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

Summary of changes:
 providers/implementations/storemgmt/file_store.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index 340b01bd2c..dc93f08b10 100644
--- a/providers/implementations/storemgmt/file_store.c
+++ b/providers/implementations/storemgmt/file_store.c
@@ -175,7 +175,7 @@ static void *file_open_dir(const char *path, const char *uri, void *provctx)
 
     if ((ctx = new_file_ctx(IS_DIR, uri, provctx)) == NULL) {
         ERR_raise(ERR_LIB_PROV, ERR_R_MALLOC_FAILURE);
-        goto err;
+        return NULL;
     }
 
     ctx->_.dir.last_entry = OPENSSL_DIR_read(&ctx->_.dir.ctx, path);