diff options
| author |   mmcc <mmcc@openbsd.org> | 2015-12-07 04:03:27 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2015-12-07 04:03:27 +0000 |
| commit | c3ec3cb15c75eb694deb65412af430083ed38aab (patch) | |
| tree | 17ba3dc3b41598bd8ba7269a71b6dad7a1f2d956 /usr.sbin/relayd/config.c | |
| parent | Remove SHA0 check, as we did in v1.21 of sha.h. (diff) | |
| download | wireguard-openbsd-c3ec3cb15c75eb694deb65412af430083ed38aab.tar.xz wireguard-openbsd-c3ec3cb15c75eb694deb65412af430083ed38aab.zip | |
Remove NULL-checks before free(). No functional change.
Diffstat (limited to 'usr.sbin/relayd/config.c')
| -rw-r--r-- | usr.sbin/relayd/config.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/usr.sbin/relayd/config.c b/usr.sbin/relayd/config.c index 32852cf182b..a6afdc666f1 100644 --- a/usr.sbin/relayd/config.c +++ b/usr.sbin/relayd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.26 2015/12/02 13:41:27 reyk Exp $ */ +/* $OpenBSD: config.c,v 1.27 2015/12/07 04:03:27 mmcc Exp $ */ /* * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -178,10 +178,8 @@ config_purge(struct relayd *env, u_int reset) if (what & CONFIG_PROTOS && env->sc_protos != NULL) { while ((proto = TAILQ_FIRST(env->sc_protos)) != NULL) { TAILQ_REMOVE(env->sc_protos, proto, entry); - if (proto->style != NULL) - free(proto->style); - if (proto->tlscapass != NULL) - free(proto->tlscapass); + free(proto->style); + free(proto->tlscapass); free(proto); } env->sc_protocount = 0; @@ -944,12 +942,9 @@ config_getrelay(struct relayd *env, struct imsg *imsg) return (0); fail: - if (rlay->rl_tls_cert) - free(rlay->rl_tls_cert); - if (rlay->rl_tls_key) - free(rlay->rl_tls_key); - if (rlay->rl_tls_ca) - free(rlay->rl_tls_ca); + free(rlay->rl_tls_cert); + free(rlay->rl_tls_key); + free(rlay->rl_tls_ca); close(rlay->rl_s); free(rlay); return (-1); @@ -993,7 +988,6 @@ config_getrelaytable(struct relayd *env, struct imsg *imsg) return (0); fail: - if (rlt != NULL) - free(rlt); + free(rlt); return (-1); } |