diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-24 12:45:50 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-05 15:41:31 +1000 |
| commit | 5340c8ea2a25d17ee2ce1f35d1fb545b8487e84b (patch) | |
| tree | ca41563c9a57add53c15a164d1529adb409946bf /crypto | |
| parent | 776cf98b493768de02f798f71f6b30c40deb3506 (diff) | |
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/12708)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cms/cms_ess.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index 3e545b7add..b6b2037532 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -430,12 +430,12 @@ ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si) int cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc) { ASN1_STRING *seq = NULL; - unsigned char *p, *pp; + unsigned char *p, *pp = NULL; int len; /* Add SigningCertificateV2 signed attribute to the signer info. */ len = i2d_ESS_SIGNING_CERT_V2(sc, NULL); - if ((pp = OPENSSL_malloc(len)) == NULL) + if (len <= 0 || (pp = OPENSSL_malloc(len)) == NULL) goto err; p = pp; i2d_ESS_SIGNING_CERT_V2(sc, &p); @@ -462,12 +462,12 @@ int cms_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc) int cms_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc) { ASN1_STRING *seq = NULL; - unsigned char *p, *pp; + unsigned char *p, *pp = NULL; int len; /* Add SigningCertificate signed attribute to the signer info. */ len = i2d_ESS_SIGNING_CERT(sc, NULL); - if ((pp = OPENSSL_malloc(len)) == NULL) + if (len <= 0 || (pp = OPENSSL_malloc(len)) == NULL) goto err; p = pp; i2d_ESS_SIGNING_CERT(sc, &p); |