Fixed memory leaks

mtrojnar · Feb 29, 2024 · 58061d7 · 58061d7
1 parent 3998bca
commit 58061d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/msi.c b/msi.c
@@ -2211,6 +2211,10 @@ 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 = 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
@@ -4602,7 +4602,7 @@ int main(int argc, char **argv)
             remove_file(options.outfile);
         }
         if (hash)
-            BIO_free(hash);
+            BIO_free_all(hash);
         BIO_free(outdata);
     }
     if (ctx && ctx->format->ctx_cleanup) {