summaryrefslogtreecommitdiffstats
path: root/usr.sbin/iscsid
diff options
context:
space:
mode:
authormmcc <mmcc@openbsd.org>2015-12-05 06:37:24 +0000
committermmcc <mmcc@openbsd.org>2015-12-05 06:37:24 +0000
commit39f0bcdd40fc4fd6867b9cc1a9eed2def8f637c2 (patch)
treee9049b09cd77f427abbbca3dafc7df95a7b92b5f /usr.sbin/iscsid
parentstrings.h -> string.h so that memcpy is declared. ok deraadt (diff)
downloadwireguard-openbsd-39f0bcdd40fc4fd6867b9cc1a9eed2def8f637c2.tar.xz
wireguard-openbsd-39f0bcdd40fc4fd6867b9cc1a9eed2def8f637c2.zip
Don't check for NULL before free()
Diffstat (limited to 'usr.sbin/iscsid')
-rw-r--r--usr.sbin/iscsid/session.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/iscsid/session.c b/usr.sbin/iscsid/session.c
index ab8c1283069..60ff190b027 100644
--- a/usr.sbin/iscsid/session.c
+++ b/usr.sbin/iscsid/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.7 2014/05/10 11:30:47 claudio Exp $ */
+/* $OpenBSD: session.c,v 1.8 2015/12/05 06:37:24 mmcc Exp $ */
/*
* Copyright (c) 2011 Claudio Jeker <claudio@openbsd.org>
@@ -126,11 +126,9 @@ session_shutdown(struct session *s)
void
session_config(struct session *s, struct session_config *sc)
{
- if (s->config.TargetName)
- free(s->config.TargetName);
+ free(s->config.TargetName);
s->config.TargetName = NULL;
- if (s->config.InitiatorName)
- free(s->config.InitiatorName);
+ free(s->config.InitiatorName);
s->config.InitiatorName = NULL;
s->config = *sc;