From 76b9c2bc27d242381595c80d38ef620f427f99f3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 26 Jun 2014 22:21:56 +0200 Subject: [PATCH] newsyslog(8): Remove a NULL-check-after-use and instead assert != NULL. Taken-from: FreeBSD --- usr.sbin/newsyslog/newsyslog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index 07c16044c0..5a447593be 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -1890,9 +1890,10 @@ do_zipwork(struct zipwork_entry *zwork) pid_t pidzip, wpid; char zresult[MAXPATHLEN]; + assert(zwork != NULL); pgm_path = NULL; strlcpy(zresult, zwork->zw_fname, sizeof(zresult)); - if (zwork != NULL && zwork->zw_conf != NULL && + if (zwork->zw_conf != NULL && zwork->zw_conf->compress > COMPRESS_NONE) for (int c = 1; c < COMPRESS_TYPES; c++) { if (zwork->zw_conf->compress == c) { -- 2.41.0