From c2ef20fdb76d0e9547ce45b1b970708aa649d109 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Sat, 14 Nov 2015 16:06:01 +0000 Subject: [PATCH] Don't try to avoid calling free(3) with NULL argument. MFC after: 1 month Sponsored by: The FreeBSD Foundation --- usr.sbin/ctld/kernel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 6f43ac09772..4b4e3fa8267 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -515,8 +515,7 @@ conf_new_from_kernel(void) STAILQ_FOREACH(port, &devlist.port_list, links) { if (strcmp(port->port_frontend, "ha") == 0) continue; - if (name) - free(name); + free(name); if (port->pp == 0 && port->vp == 0) name = checked_strdup(port->port_name); else if (port->vp == 0) @@ -583,8 +582,7 @@ conf_new_from_kernel(void) } cp->p_ctl_port = port->port_id; } - if (name) - free(name); + free(name); STAILQ_FOREACH(lun, &devlist.lun_list, links) { struct cctl_lun_nv *nv; -- 2.45.2