diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-24 07:52:24 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-24 07:52:24 -0400 |
| commit | 0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6 (patch) | |
| tree | 9ffaa0bec3d0f14092948174eeea90dc8e2ee7c4 /crypto/ec | |
| parent | 7c82e339a677f8546e1456c7a8f6788598a9de43 (diff) | |
free NULL cleanup
Start ensuring all OpenSSL "free" routines allow NULL, and remove
any if check before calling them.
This gets ASN1_OBJECT_free and ASN1_STRING_free.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/ec')
| -rw-r--r-- | crypto/ec/ec_asn1.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 87cc334444..90de23b116 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -317,8 +317,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field) return 0; /* clear the old values (if necessary) */ - if (field->fieldType != NULL) - ASN1_OBJECT_free(field->fieldType); + ASN1_OBJECT_free(field->fieldType); if (field->p.other != NULL) ASN1_TYPE_free(field->p.other); @@ -654,7 +653,7 @@ ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *group, return NULL; } } else { - if (ret->type == 0 && ret->value.named_curve) + if (ret->type == 0) ASN1_OBJECT_free(ret->value.named_curve); else if (ret->type == 1 && ret->value.parameters) ECPARAMETERS_free(ret->value.parameters); |