d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to avoid calling free(3) with NULL argument.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-11-14 16:06:01 +00:00
parent 9f72f0ee52
commit c2ef20fdb7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/ctld/kernel.c
View File

@ -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;