diff options
| author | Adam Langley <agl@chromium.org> | 2014-07-25 03:19:18 +0400 |
|---|---|---|
| committer | Adam Langley <agl@chromium.org> | 2014-07-29 04:05:12 +0400 |
| commit | 7893c008e673bd157b698ac5ebd6e43ce8cce409 (patch) | |
| tree | ea7cfdea79b2042f32a6206cf438286b2b7b0570 /crypto/pkcs8 | |
| parent | ac71c0952940a0f0a751b860c5a0544eb994b98f (diff) | |
Memory leak and NULL dereference fixes.
PR#3403
(Imported from upstream's e42c208235a86beee16ff0d0e6ca4e164a57d21a)
Change-Id: Ibcdd8c95604f661055bfb1e91b15fd3686a04c0d
Diffstat (limited to 'crypto/pkcs8')
| -rw-r--r-- | crypto/pkcs8/p5_pbev2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/pkcs8/p5_pbev2.c b/crypto/pkcs8/p5_pbev2.c index 66746df4..85170a44 100644 --- a/crypto/pkcs8/p5_pbev2.c +++ b/crypto/pkcs8/p5_pbev2.c @@ -88,7 +88,11 @@ static int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len) ASN1_STRING *os; if ((os=M_ASN1_OCTET_STRING_new()) == NULL) return(0); - if (!M_ASN1_OCTET_STRING_set(os,data,len)) return(0); + if (!M_ASN1_OCTET_STRING_set(os,data,len)) + { + M_ASN1_OCTET_STRING_free(os); + return 0; + } ASN1_TYPE_set(a,V_ASN1_OCTET_STRING,os); return(1); } |