diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
| commit | b548a1f11c06ccdfa4f52a539912d22d77ee309e (patch) | |
| tree | 37ff8792ddf09e4805aa3ba76b805923d3c52734 /crypto/objects | |
| parent | 33fbca83dcd05b77f807fab205c4523b8cfe85b5 (diff) | |
free null cleanup finale
Don't check for NULL before calling OPENSSL_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.c | 9 | ||||
| -rw-r--r-- | crypto/objects/obj_lib.c | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 46c4f878d1..bca3dedd79 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -276,8 +276,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj) ao[i]->obj = o; aop = lh_ADDED_OBJ_insert(added, ao[i]); /* memory leak, buit should not normally matter */ - if (aop != NULL) - OPENSSL_free(aop); + OPENSSL_free(aop); } } o->flags &= @@ -289,10 +288,8 @@ int OBJ_add_object(const ASN1_OBJECT *obj) OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE); err: for (i = ADDED_DATA; i <= ADDED_NID; i++) - if (ao[i] != NULL) - OPENSSL_free(ao[i]); - if (o != NULL) - OPENSSL_free(o); + OPENSSL_free(ao[i]); + OPENSSL_free(o); return (NID_undef); } diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c index 0bcb5df506..58e9a92fe4 100644 --- a/crypto/objects/obj_lib.c +++ b/crypto/objects/obj_lib.c @@ -114,14 +114,10 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) return (r); err: OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE); - if (ln != NULL) - OPENSSL_free(ln); - if (sn != NULL) - OPENSSL_free(sn); - if (data != NULL) - OPENSSL_free(data); - if (r != NULL) - OPENSSL_free(r); + OPENSSL_free(ln); + OPENSSL_free(sn); + OPENSSL_free(data); + OPENSSL_free(r); return (NULL); } |