nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 17:08:05 -05:00
Code Issues Projects Releases Wiki Activity

fixed MSI memory leak

Browse Source
This commit is contained in:
olszomal 2020-07-03 11:31:52 +02:00 committed by Michał Trojnara
parent 9be7753a8f
commit 293d92b0b0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osslsigncode.c
View File

@ -4746,20 +4746,6 @@ static PKCS7 *msi_presign_file(file_type_t type, cmd_type_t cmd, FILE_HEADER *he
{ {
PKCS7 *sig = NULL; PKCS7 *sig = NULL;
/* Obtain a current signature from previously-signed file */
if ((cmd == CMD_SIGN && options->nest) ||
(cmd == CMD_ATTACH && options->nest) || cmd == CMD_ADD) {
if (!msi_check_MsiDigitalSignatureEx(ole, options->md))
return NULL; /* FAILED */
*cursig = msi_extract_signature_to_pkcs7(ole);
if (*cursig == NULL) {
fprintf(stderr, "Unable to extract existing signature in -nest mode\n");
return NULL; /* FAILED */
}
if (cmd == CMD_ADD)
sig = *cursig;
}
/* Create outdata MSI file */ /* Create outdata MSI file */
if (!access(options->outfile, R_OK)) { if (!access(options->outfile, R_OK)) {
/* outdata file exists */ /* outdata file exists */
@ -4780,6 +4766,21 @@ static PKCS7 *msi_presign_file(file_type_t type, cmd_type_t cmd, FILE_HEADER *he
fprintf(stderr, "Unable to msi_handle_dir()\n"); fprintf(stderr, "Unable to msi_handle_dir()\n");
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
/* Obtain a current signature from previously-signed file */
if ((cmd == CMD_SIGN && options->nest) ||
(cmd == CMD_ATTACH && options->nest) || cmd == CMD_ADD) {
if (!msi_check_MsiDigitalSignatureEx(ole, options->md))
return NULL; /* FAILED */
*cursig = msi_extract_signature_to_pkcs7(ole);
if (*cursig == NULL) {
fprintf(stderr, "Unable to extract existing signature in -nest mode\n");
return NULL; /* FAILED */
}
if (cmd == CMD_ADD)
sig = *cursig;
}
/* Obtain an existing signature or create a new one */ /* Obtain an existing signature or create a new one */
if ((cmd == CMD_ATTACH) || (cmd == CMD_SIGN)) if ((cmd == CMD_ATTACH) || (cmd == CMD_SIGN))
sig = get_pkcs7(cmd, hash, type, indata, options, header, cparams); sig = get_pkcs7(cmd, hash, type, indata, options, header, cparams);