diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-26 21:20:52 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-07-05 17:45:58 +0100 |
| commit | b77a86535e96d8b256cb26c27d43d22904aad718 (patch) | |
| tree | 5e5b4ba080e775ba7f39513740ae22dfaf287137 /crypto/pkcs7 | |
| parent | 4aed8756d86e2b934e83d916e57bee91c83c4b28 (diff) | |
Fix mem error handling in PKCS7_simple_smimecap
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_attr.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c index a96f41e1b9..e90bf03c52 100644 --- a/crypto/pkcs7/pk7_attr.c +++ b/crypto/pkcs7/pk7_attr.c @@ -49,6 +49,7 @@ STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si) /* Basic smime-capabilities OID and optional integer arg */ int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg) { + ASN1_INTEGER *nbit = NULL; X509_ALGOR *alg; if ((alg = X509_ALGOR_new()) == NULL) { @@ -58,28 +59,28 @@ int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg) ASN1_OBJECT_free(alg->algorithm); alg->algorithm = OBJ_nid2obj(nid); if (arg > 0) { - ASN1_INTEGER *nbit; if ((alg->parameter = ASN1_TYPE_new()) == NULL) { - PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP, ERR_R_MALLOC_FAILURE); - return 0; + goto err; } if ((nbit = ASN1_INTEGER_new()) == NULL) { - PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP, ERR_R_MALLOC_FAILURE); - return 0; + goto err; } if (!ASN1_INTEGER_set(nbit, arg)) { - PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP, ERR_R_MALLOC_FAILURE); - return 0; + goto err; } alg->parameter->value.integer = nbit; alg->parameter->type = V_ASN1_INTEGER; + nbit = NULL; } if (!sk_X509_ALGOR_push(sk, alg)) { - PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP, ERR_R_MALLOC_FAILURE); - X509_ALGOR_free(alg); - return 0; + goto err; } return 1; +err: + PKCS7err(PKCS7_F_PKCS7_SIMPLE_SMIMECAP, ERR_R_MALLOC_FAILURE); + ASN1_INTEGER_free(nbit); + X509_ALGOR_free(alg); + return 0; } int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid) |