diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 03:21:10 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 14:35:07 +0100 |
| commit | d2aea038297e0c64ca66e6844cbb37377365885e (patch) | |
| tree | 13e11f5b4a91e0dc5316bb7c6fb7203c313be84b /crypto/asn1/asn_pack.c | |
| parent | 3b3b69ab25fbaba80a843dedec5ae9733fefca43 (diff) | |
Memory leak and NULL dereference fixes.
PR#3403
Diffstat (limited to 'crypto/asn1/asn_pack.c')
| -rw-r--r-- | crypto/asn1/asn_pack.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index ad738217d7..00dbf5ad3c 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -134,15 +134,23 @@ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct) if (!(octmp->length = i2d(obj, NULL))) { ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR); - return NULL; + goto err; } if (!(p = OPENSSL_malloc (octmp->length))) { ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } octmp->data = p; i2d (obj, &p); return octmp; + err: + if (!oct || !*oct) + { + ASN1_STRING_free(octmp); + if (oct) + *oct = NULL; + } + return NULL; } #endif |