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

Fix memory leak

Browse Source
This commit is contained in:
olszomal 2023-02-24 14:55:11 +01:00 committed by Michał Trojnara
parent 32b65659be
commit 4db6ed0cad
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osslsigncode.c
View File

@ -1630,9 +1630,6 @@ static u_char *pe_calc_page_hash(char *indata, uint32_t header_size,
BIO_free_all(bhash); BIO_free_all(bhash);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
res = OPENSSL_malloc((size_t)phlen);
zeroes = OPENSSL_zalloc((size_t)pagesize);
BIO_push(bhash, BIO_new(BIO_s_null())); BIO_push(bhash, BIO_new(BIO_s_null()));
if (!BIO_write_ex(bhash, indata, header_size + 88, &written) if (!BIO_write_ex(bhash, indata, header_size + 88, &written)
|| written != header_size + 88) { || written != header_size + 88) {
@ -1650,11 +1647,14 @@ static u_char *pe_calc_page_hash(char *indata, uint32_t header_size,
BIO_free_all(bhash); BIO_free_all(bhash);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
zeroes = OPENSSL_zalloc((size_t)pagesize);
if (!BIO_write_ex(bhash, zeroes, pagesize - hdrsize, &written) if (!BIO_write_ex(bhash, zeroes, pagesize - hdrsize, &written)
|| written != pagesize - hdrsize) { || written != pagesize - hdrsize) {
BIO_free_all(bhash); BIO_free_all(bhash);
OPENSSL_free(zeroes);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
res = OPENSSL_malloc((size_t)phlen);
memset(res, 0, 4); memset(res, 0, 4);
BIO_gets(bhash, (char*)res + 4, EVP_MD_size(md)); BIO_gets(bhash, (char*)res + 4, EVP_MD_size(md));
BIO_free_all(bhash); BIO_free_all(bhash);
@ -1673,6 +1673,8 @@ static u_char *pe_calc_page_hash(char *indata, uint32_t header_size,
if (!BIO_set_md(bhash, md)) { if (!BIO_set_md(bhash, md)) {
printf("Unable to set the message digest of BIO\n"); printf("Unable to set the message digest of BIO\n");
BIO_free_all(bhash); BIO_free_all(bhash);
OPENSSL_free(zeroes);
OPENSSL_free(res);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
BIO_push(bhash, BIO_new(BIO_s_null())); BIO_push(bhash, BIO_new(BIO_s_null()));
@ -1680,26 +1682,32 @@ static u_char *pe_calc_page_hash(char *indata, uint32_t header_size,
if (!BIO_write_ex(bhash, indata + ro + l, rs - l, &written) if (!BIO_write_ex(bhash, indata + ro + l, rs - l, &written)
|| written != rs - l) { || written != rs - l) {
BIO_free_all(bhash); BIO_free_all(bhash);
OPENSSL_free(zeroes);
OPENSSL_free(res);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
if (!BIO_write_ex(bhash, zeroes, pagesize - (rs - l), &written) if (!BIO_write_ex(bhash, zeroes, pagesize - (rs - l), &written)
|| written != pagesize - (rs - l)) { || written != pagesize - (rs - l)) {
BIO_free_all(bhash); BIO_free_all(bhash);
OPENSSL_free(zeroes);
OPENSSL_free(res);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
} else { } else {
if (!BIO_write_ex(bhash, indata + ro + l, pagesize, &written) if (!BIO_write_ex(bhash, indata + ro + l, pagesize, &written)
|| written != pagesize) { || written != pagesize) {
BIO_free_all(bhash); BIO_free_all(bhash);
OPENSSL_free(zeroes);
OPENSSL_free(res);
return NULL; /* FAILED */ return NULL; /* FAILED */
} }
} }
BIO_gets(bhash, (char*)res + pi*pphlen + 4, EVP_MD_size(md)); BIO_gets(bhash, (char*)res + pi*pphlen + 4, EVP_MD_size(md));
BIO_free_all(bhash);
} }
lastpos = ro + rs; lastpos = ro + rs;
sections += 40; sections += 40;
} }
BIO_free_all(bhash);
PUT_UINT32_LE(lastpos, res + pi*pphlen); PUT_UINT32_LE(lastpos, res + pi*pphlen);
memset(res + pi*pphlen + 4, 0, (size_t)EVP_MD_size(md)); memset(res + pi*pphlen + 4, 0, (size_t)EVP_MD_size(md));
pi++; pi++;