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

Unmap a mapped view of a file , CID 1519391

Browse Source
This commit is contained in:
olszomal 2023-01-13 11:28:24 +01:00 committed by Michał Trojnara
parent dadca2516d
commit 7f87f930f7
1 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
osslsigncode.c
View File

@ -4879,6 +4879,18 @@ static char *map_file(const char *infile, const size_t size)
return indata; return indata;
} }
static void unmap_file(char *indata, const size_t size)
{
if (!indata)
return;
#ifdef WIN32
(void)size;
UnmapViewOfFile(indata);
#else
munmap(indata, size);
#endif /* WIN32 */
}
static int input_validation(file_type_t type, GLOBAL_OPTIONS *options, FILE_HEADER *header, static int input_validation(file_type_t type, GLOBAL_OPTIONS *options, FILE_HEADER *header,
MSI_PARAMS *msiparams, char *indata, uint32_t filesize) MSI_PARAMS *msiparams, char *indata, uint32_t filesize)
{ {
@ -4933,7 +4945,6 @@ static int check_attached_data(file_type_t type, FILE_HEADER *header, GLOBAL_OPT
uint32_t filesize; uint32_t filesize;
char *outdata; char *outdata;
if (type == FILE_TYPE_PE) {
filesize = get_file_size(options->outfile); filesize = get_file_size(options->outfile);
if (!filesize) { if (!filesize) {
printf("Error verifying result\n"); printf("Error verifying result\n");
@ -4944,6 +4955,7 @@ static int check_attached_data(file_type_t type, FILE_HEADER *header, GLOBAL_OPT
printf("Error verifying result\n"); printf("Error verifying result\n");
return 1; /* FAILED */ return 1; /* FAILED */
} }
if (type == FILE_TYPE_PE) {
if (!pe_verify_header(outdata, options->outfile, filesize, header)) { if (!pe_verify_header(outdata, options->outfile, filesize, header)) {
printf("Corrupt PE file\n"); printf("Corrupt PE file\n");
return 1; /* FAILED */ return 1; /* FAILED */
@ -4953,16 +4965,6 @@ static int check_attached_data(file_type_t type, FILE_HEADER *header, GLOBAL_OPT
return 1; /* FAILED */ return 1; /* FAILED */
} }
} else if (type == FILE_TYPE_CAB) { } else if (type == FILE_TYPE_CAB) {
filesize = get_file_size(options->outfile);
if (!filesize) {
printf("Error verifying result\n");
return 1; /* FAILED */
}
outdata = map_file(options->outfile, filesize);
if (!outdata) {
printf("Error verifying result\n");
return 1; /* FAILED */
}
if (!cab_verify_header(outdata, options->outfile, filesize, header)) { if (!cab_verify_header(outdata, options->outfile, filesize, header)) {
printf("Corrupt CAB file\n"); printf("Corrupt CAB file\n");
return 1; /* FAILED */ return 1; /* FAILED */
@ -4972,16 +4974,6 @@ static int check_attached_data(file_type_t type, FILE_HEADER *header, GLOBAL_OPT
return 1; /* FAILED */ return 1; /* FAILED */
} }
} else if (type == FILE_TYPE_MSI) { } else if (type == FILE_TYPE_MSI) {
filesize = get_file_size(options->outfile);
if (!filesize) {
printf("Error verifying result\n");
return 1; /* FAILED */
}
outdata = map_file(options->outfile, filesize);
if (!outdata) {
printf("Error verifying result\n");
return 1; /* FAILED */
}
if (!msi_verify_header(outdata, filesize, msiparams)) { if (!msi_verify_header(outdata, filesize, msiparams)) {
printf("Corrupt MSI file: %s\n", options->outfile); printf("Corrupt MSI file: %s\n", options->outfile);
return 1; /* FAILED */ return 1; /* FAILED */
@ -4994,6 +4986,7 @@ static int check_attached_data(file_type_t type, FILE_HEADER *header, GLOBAL_OPT
printf("Unknown input type for file: %s\n", options->infile); printf("Unknown input type for file: %s\n", options->infile);
return 1; /* FAILED */ return 1; /* FAILED */
} }
unmap_file(outdata, filesize);
return 0; /* OK */ return 0; /* OK */
} }
@ -5550,6 +5543,7 @@ static PKCS7 *get_sigfile(char *sigfile, file_type_t type)
else else
sig = extract_existing_pkcs7(insigdata, &header); sig = extract_existing_pkcs7(insigdata, &header);
} }
unmap_file(insigdata, sigfilesize);
return sig; /* OK */ return sig; /* OK */
} }
@ -6258,6 +6252,7 @@ int main(int argc, char **argv)
ret = 1; /* Failed */ ret = 1; /* Failed */
goto err_cleanup; goto err_cleanup;
} }
unmap_file(catdata, catsize);
} }
hash = BIO_new(BIO_f_md()); hash = BIO_new(BIO_f_md());
@ -6411,13 +6406,7 @@ err_cleanup:
#endif /* WIN32 */ #endif /* WIN32 */
} }
} }
if (indata) { unmap_file(indata, filesize);
#ifdef WIN32
UnmapViewOfFile(indata);
#else
munmap(indata, filesize);
#endif /* WIN32 */
}
free_msi_params(&msiparams); free_msi_params(&msiparams);
free_crypto_params(&cparams); free_crypto_params(&cparams);
free_options(&options); free_options(&options);