Date: Sat, 14 Nov 2015 16:06:01 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290821 - head/usr.sbin/ctld Message-ID: <201511141606.tAEG61Rh062202@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Sat Nov 14 16:06:01 2015 New Revision: 290821 URL: https://svnweb.freebsd.org/changeset/base/290821 Log: Don't try to avoid calling free(3) with NULL argument. MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/ctld/kernel.c Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Sat Nov 14 14:56:01 2015 (r290820) +++ head/usr.sbin/ctld/kernel.c Sat Nov 14 16:06:01 2015 (r290821) @@ -515,8 +515,7 @@ retry_port: 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 @@ retry_port: } 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511141606.tAEG61Rh062202>