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

fixed double free

Browse Source
This commit is contained in:
Per Allansson 2015-03-07 08:23:06 +01:00
parent 50b66a1eb4
commit 80b92fd778
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osslsigncode.c
View File

@ -3056,20 +3056,22 @@ int main(int argc, char **argv)
for(i = sk_X509_num(certs)-1; i>=0; i--) for(i = sk_X509_num(certs)-1; i>=0; i--)
PKCS7_add_certificate(sig, sk_X509_value(certs, i)); PKCS7_add_certificate(sig, sk_X509_value(certs, i));
if (p7 == NULL) { if (p7 == NULL || certs != p7->d.sign->cert) {
sk_X509_free(certs); sk_X509_free(certs);
} else { certs = NULL;
}
if (p7) {
PKCS7_free(p7); PKCS7_free(p7);
p7 = NULL; p7 = NULL;
} }
certs = NULL; if (xcerts) {
if (p7x == NULL) {
sk_X509_free(xcerts); sk_X509_free(xcerts);
} else { xcerts = NULL;
}
if (p7x) {
PKCS7_free(p7x); PKCS7_free(p7x);
p7x = NULL; p7x = NULL;
} }
xcerts = NULL;
get_indirect_data_blob(&p, &len, md, type, pagehash, indata, peheader, pe32plus, fileend); get_indirect_data_blob(&p, &len, md, type, pagehash, indata, peheader, pe32plus, fileend);
len -= EVP_MD_size(md); len -= EVP_MD_size(md);
@ -3206,18 +3208,16 @@ err_cleanup:
pass = NULL; pass = NULL;
} }
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);
if (certs && (p7 == NULL || certs != p7->d.sign->cert))
sk_X509_free(certs);
if (p7) if (p7)
PKCS7_free(p7); PKCS7_free(p7);
else if (certs)
sk_X509_free(certs);
if (p7x) if (p7x)
PKCS7_free(p7x); PKCS7_free(p7x);
else if (xcerts) if (xcerts)
sk_X509_free(xcerts); sk_X509_free(xcerts);
if (cert) if (cert)
X509_free(cert); X509_free(cert);
if (certs)
sk_X509_free(certs);
if (pkey) if (pkey)
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
if (hash) if (hash)