From 192e7a732b9159d5b4494c6ce0ca2b5894831e8f Mon Sep 17 00:00:00 2001
From: olszomal <Malgorzata.Olszowka@stunnel.org>
Date: Thu, 29 Feb 2024 10:05:02 +0100
Subject: [PATCH] Fixed memory leaks

---
 msi.c          | 5 +++++
 osslsigncode.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/msi.c b/msi.c
index eb55af4..441b9d5 100644
--- a/msi.c
+++ b/msi.c
@@ -2211,6 +2211,11 @@ static int msi_calc_MsiDigitalSignatureEx(FILE_FORMAT_CTX *ctx, BIO *hash)
         printf("Unable to calculate MSI pre-hash ('metadata') hash\n");
         return 0; /* FAILED */
     }
+    if (ctx->msi_ctx->p_msiex) {
+        /* attach-signature counts MsiDigitalSignatureEx stream data twice */
+        OPENSSL_free(ctx->msi_ctx->p_msiex);
+        ctx->msi_ctx->p_msiex = NULL;
+    }
     ctx->msi_ctx->p_msiex = OPENSSL_malloc(EVP_MAX_MD_SIZE);
     ctx->msi_ctx->len_msiex = (uint32_t)BIO_gets(prehash,
         (char *)ctx->msi_ctx->p_msiex, EVP_MAX_MD_SIZE);
diff --git a/osslsigncode.c b/osslsigncode.c
index 6fd7b03..e3f09db 100644
--- a/osslsigncode.c
+++ b/osslsigncode.c
@@ -4602,7 +4602,7 @@ err_cleanup:
             remove_file(options.outfile);
         }
         if (hash)
-            BIO_free(hash);
+            BIO_free_all(hash);
         BIO_free(outdata);
     }
     if (ctx && ctx->format->ctx_cleanup) {