diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-25 11:31:18 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-25 11:31:18 -0400 |
| commit | ca3a82c3b364e1e584546f0f3bbb938b0b472580 (patch) | |
| tree | 06c73d297f19629c1bf56bbf06dd2d443d4ac78f /crypto/asn1 | |
| parent | 2011b169fa90edd4d986e7dbbd3d64587d316a22 (diff) | |
free NULL cleanup
This commit handles BIO_ACCEPT_free BIO_CB_FREE BIO_CONNECT_free
BIO_free BIO_free_all BIO_vfree
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/asn_mime.c | 3 | ||||
| -rw-r--r-- | crypto/asn1/bio_asn1.c | 4 | ||||
| -rw-r--r-- | crypto/asn1/bio_ndef.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index e96fb02094..e810345579 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -650,8 +650,7 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret) BIO_write(bpart, linebuf, len); } } - if (bpart != NULL) - BIO_free(bpart); + BIO_free(bpart); return 0; } diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c index 0b4fd1dd9e..d4be23c190 100644 --- a/crypto/asn1/bio_asn1.c +++ b/crypto/asn1/bio_asn1.c @@ -179,8 +179,8 @@ static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size) static int asn1_bio_free(BIO *b) { - BIO_ASN1_BUF_CTX *ctx; - ctx = (BIO_ASN1_BUF_CTX *)b->ptr; + BIO_ASN1_BUF_CTX *ctx = (BIO_ASN1_BUF_CTX *)b->ptr; + if (ctx == NULL) return 0; if (ctx->buf) diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c index 4a73ca9eac..1018787a63 100644 --- a/crypto/asn1/bio_ndef.c +++ b/crypto/asn1/bio_ndef.c @@ -142,8 +142,7 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it) return sarg.ndef_bio; err: - if (asn_bio) - BIO_free(asn_bio); + BIO_free(asn_bio); if (ndef_aux) OPENSSL_free(ndef_aux); return NULL; |