diff options
author | tedu <> | 2014-05-30 02:52:11 +0000 |
---|---|---|
committer | tedu <> | 2014-05-30 02:52:11 +0000 |
commit | 9598b4272312fc9b55154e675c1adb3a21b491b3 (patch) | |
tree | a802460259115af2ecf6be49736b1b6a09173232 /src/lib/libcrypto/x509 | |
parent | 50df74c1961eaed1e88ea9c7bb4cfcab77d75043 (diff) | |
download | openbsd-9598b4272312fc9b55154e675c1adb3a21b491b3.tar.gz openbsd-9598b4272312fc9b55154e675c1adb3a21b491b3.tar.bz2 openbsd-9598b4272312fc9b55154e675c1adb3a21b491b3.zip |
no need for null check before free. from Brendan MacDonell
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r-- | src/lib/libcrypto/x509/by_dir.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_vpm.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c index fdfca6140a..554f6600dc 100644 --- a/src/lib/libcrypto/x509/by_dir.c +++ b/src/lib/libcrypto/x509/by_dir.c | |||
@@ -184,8 +184,7 @@ by_dir_hash_cmp(const BY_DIR_HASH * const *a, | |||
184 | static void | 184 | static void |
185 | by_dir_entry_free(BY_DIR_ENTRY *ent) | 185 | by_dir_entry_free(BY_DIR_ENTRY *ent) |
186 | { | 186 | { |
187 | if (ent->dir) | 187 | free(ent->dir); |
188 | free(ent->dir); | ||
189 | if (ent->hashes) | 188 | if (ent->hashes) |
190 | sk_BY_DIR_HASH_pop_free(ent->hashes, by_dir_hash_free); | 189 | sk_BY_DIR_HASH_pop_free(ent->hashes, by_dir_hash_free); |
191 | free(ent); | 190 | free(ent); |
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c index c2cebd936f..3ee3116ac1 100644 --- a/src/lib/libcrypto/x509/x509_vpm.c +++ b/src/lib/libcrypto/x509/x509_vpm.c | |||
@@ -212,8 +212,7 @@ X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, const X509_VERIFY_PARAM *from) | |||
212 | int | 212 | int |
213 | X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) | 213 | X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) |
214 | { | 214 | { |
215 | if (param->name) | 215 | free(param->name); |
216 | free(param->name); | ||
217 | param->name = BUF_strdup(name); | 216 | param->name = BUF_strdup(name); |
218 | if (param->name) | 217 | if (param->name) |
219 | return 1; | 218 | return 1; |