From abd9b10898e82011a65d8e8fca56bf56532edd69 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Fri, 30 May 2014 06:22:57 +0000 Subject: more: no need for null check before free ok tedu guenther --- src/lib/libcrypto/dso/dso_dlfcn.c | 3 +-- src/lib/libcrypto/dso/dso_lib.c | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/lib/libcrypto/dso') diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c index bebfdcdbc4..87ebdb660d 100644 --- a/src/lib/libcrypto/dso/dso_dlfcn.c +++ b/src/lib/libcrypto/dso/dso_dlfcn.c @@ -146,8 +146,7 @@ dlfcn_load(DSO *dso) err: /* Cleanup! */ - if (filename != NULL) - free(filename); + free(filename); if (ptr != NULL) dlclose(ptr); return (0); diff --git a/src/lib/libcrypto/dso/dso_lib.c b/src/lib/libcrypto/dso/dso_lib.c index 3859be7b42..fa1c3c2b54 100644 --- a/src/lib/libcrypto/dso/dso_lib.c +++ b/src/lib/libcrypto/dso/dso_lib.c @@ -156,11 +156,8 @@ DSO_free(DSO *dso) } sk_void_free(dso->meth_data); - if (dso->filename != NULL) - free(dso->filename); - if (dso->loaded_filename != NULL) - free(dso->loaded_filename); - + free(dso->filename); + free(dso->loaded_filename); free(dso); return (1); } -- cgit v1.2.3-55-g6feb