diff options
| author | deraadt <> | 2014-05-30 06:22:57 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-05-30 06:22:57 +0000 |
| commit | abd9b10898e82011a65d8e8fca56bf56532edd69 (patch) | |
| tree | 1ff700d79cee9e764329e5c50d7eb8d5109789cc /src/lib/libcrypto/dso | |
| parent | 2ff11427d41a52cb126e9892413db066f8ae166a (diff) | |
| download | openbsd-abd9b10898e82011a65d8e8fca56bf56532edd69.tar.gz openbsd-abd9b10898e82011a65d8e8fca56bf56532edd69.tar.bz2 openbsd-abd9b10898e82011a65d8e8fca56bf56532edd69.zip | |
more: no need for null check before free
ok tedu guenther
Diffstat (limited to 'src/lib/libcrypto/dso')
| -rw-r--r-- | src/lib/libcrypto/dso/dso_dlfcn.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_lib.c | 7 |
2 files changed, 3 insertions, 7 deletions
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) | |||
| 146 | 146 | ||
| 147 | err: | 147 | err: |
| 148 | /* Cleanup! */ | 148 | /* Cleanup! */ |
| 149 | if (filename != NULL) | 149 | free(filename); |
| 150 | free(filename); | ||
| 151 | if (ptr != NULL) | 150 | if (ptr != NULL) |
| 152 | dlclose(ptr); | 151 | dlclose(ptr); |
| 153 | return (0); | 152 | 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) | |||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | sk_void_free(dso->meth_data); | 158 | sk_void_free(dso->meth_data); |
| 159 | if (dso->filename != NULL) | 159 | free(dso->filename); |
| 160 | free(dso->filename); | 160 | free(dso->loaded_filename); |
| 161 | if (dso->loaded_filename != NULL) | ||
| 162 | free(dso->loaded_filename); | ||
| 163 | |||
| 164 | free(dso); | 161 | free(dso); |
| 165 | return (1); | 162 | return (1); |
| 166 | } | 163 | } |
