diff options
| author | deraadt <> | 2014-05-30 06:22:57 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-05-30 06:22:57 +0000 |
| commit | 93efbaa11c9b941fe460a1f6bfa75b21d8624e53 (patch) | |
| tree | 1ff700d79cee9e764329e5c50d7eb8d5109789cc /src/lib/libcrypto/objects/obj_dat.c | |
| parent | 4aef4566c1a41608b7d78a7d5cfc3e031b7e4fe3 (diff) | |
| download | openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.tar.gz openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.tar.bz2 openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.zip | |
more: no need for null check before free
ok tedu guenther
Diffstat (limited to 'src/lib/libcrypto/objects/obj_dat.c')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index e31940da45..a71959222f 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -294,8 +294,7 @@ OBJ_add_object(const ASN1_OBJECT *obj) | |||
| 294 | ao[i]->obj = o; | 294 | ao[i]->obj = o; |
| 295 | aop = lh_ADDED_OBJ_insert(added, ao[i]); | 295 | aop = lh_ADDED_OBJ_insert(added, ao[i]); |
| 296 | /* memory leak, buit should not normally matter */ | 296 | /* memory leak, buit should not normally matter */ |
| 297 | if (aop != NULL) | 297 | free(aop); |
| 298 | free(aop); | ||
| 299 | } | 298 | } |
| 300 | } | 299 | } |
| 301 | o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | | 300 | o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | |
| @@ -308,10 +307,8 @@ err2: | |||
| 308 | OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE); | 307 | OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE); |
| 309 | err: | 308 | err: |
| 310 | for (i = ADDED_DATA; i <= ADDED_NID; i++) | 309 | for (i = ADDED_DATA; i <= ADDED_NID; i++) |
| 311 | if (ao[i] != NULL) | 310 | free(ao[i]); |
| 312 | free(ao[i]); | 311 | free(o); |
| 313 | if (o != NULL) | ||
| 314 | free(o); | ||
| 315 | return (NID_undef); | 312 | return (NID_undef); |
| 316 | } | 313 | } |
| 317 | 314 | ||
