summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509
diff options
context:
space:
mode:
authortedu <>2014-05-30 02:52:11 +0000
committertedu <>2014-05-30 02:52:11 +0000
commitc442171f7692d3610a7aa5a08593cabf7253c5af (patch)
treea802460259115af2ecf6be49736b1b6a09173232 /src/lib/libcrypto/x509
parent60f672682a47559e679725da4d8dc8efa1ddceff (diff)
downloadopenbsd-c442171f7692d3610a7aa5a08593cabf7253c5af.tar.gz
openbsd-c442171f7692d3610a7aa5a08593cabf7253c5af.tar.bz2
openbsd-c442171f7692d3610a7aa5a08593cabf7253c5af.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.c3
-rw-r--r--src/lib/libcrypto/x509/x509_vpm.c3
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,
184static void 184static void
185by_dir_entry_free(BY_DIR_ENTRY *ent) 185by_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)
212int 212int
213X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) 213X509_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;