summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmcc <mmcc@cvs.openbsd.org>2015-10-28 15:45:52 +0000
committermmcc <mmcc@cvs.openbsd.org>2015-10-28 15:45:52 +0000
commit91f67c7835552b7a6cdcd43b8a9df32be3e4bd61 (patch)
tree97cd4585abd01721acee6e5aa02f3403aef8707f
parent3c6d22b594b353c253e64419fd3efb245bb1d307 (diff)
While I'm in here, drop a NULL-check before free.
-rw-r--r--usr.sbin/httpd/httpd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index b9157abbe64..fb92bb68e32 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.c,v 1.42 2015/10/26 11:03:29 jung Exp $ */
+/* $OpenBSD: httpd.c,v 1.43 2015/10/28 15:45:51 mmcc Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -454,8 +454,7 @@ parent_dispatch_logger(int fd, struct privsep_proc *p, struct imsg *imsg)
if (IMSG_DATA_SIZE(imsg) > 0)
str = get_string(imsg->data, IMSG_DATA_SIZE(imsg));
parent_reload(env, CONFIG_RELOAD, str);
- if (str != NULL)
- free(str);
+ free(str);
break;
case IMSG_CTL_SHUTDOWN:
parent_shutdown(env);