diff options
| author |   mmcc <mmcc@openbsd.org> | 2015-12-08 07:16:33 +0000 |
|---|---|---|
| committer | mmcc <mmcc@openbsd.org> | 2015-12-08 07:16:33 +0000 |
| commit | 7e3cce456c00bb083a24c2d22e5aef1468d4d169 (patch) | |
| tree | cb62a61fd4f2f162c5a1d4042fa89a1bc1aef591 /usr.sbin/ypserv | |
| parent | Remove a NULL-check before free(). (diff) | |
| download | wireguard-openbsd-7e3cce456c00bb083a24c2d22e5aef1468d4d169.tar.xz wireguard-openbsd-7e3cce456c00bb083a24c2d22e5aef1468d4d169.zip | |
Remove NULL-checks before free().
Diffstat (limited to 'usr.sbin/ypserv')
| -rw-r--r-- | usr.sbin/ypserv/revnetgroup/parse_netgroup.c | 17 | ||||
| -rw-r--r-- | usr.sbin/ypserv/ypserv/ypserv_db.c | 8 |
2 files changed, 9 insertions, 16 deletions
diff --git a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c index 97ea08458e0..d488f454094 100644 --- a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c +++ b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse_netgroup.c,v 1.12 2009/10/27 23:59:58 deraadt Exp $ */ +/* $OpenBSD: parse_netgroup.c,v 1.13 2015/12/08 07:16:33 mmcc Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -143,20 +143,15 @@ __endnetgrent(void) free(olp); } linehead = NULL; - if (grouphead.grname) { - free(grouphead.grname); - grouphead.grname = NULL; - } + free(grouphead.grname); + grouphead.grname = NULL; gp = grouphead.gr; while (gp) { ogp = gp; gp = gp->ng_next; - if (ogp->ng_str[NG_HOST]) - free(ogp->ng_str[NG_HOST]); - if (ogp->ng_str[NG_USER]) - free(ogp->ng_str[NG_USER]); - if (ogp->ng_str[NG_DOM]) - free(ogp->ng_str[NG_DOM]); + free(ogp->ng_str[NG_HOST]); + free(ogp->ng_str[NG_USER]); + free(ogp->ng_str[NG_DOM]); free(ogp); } grouphead.gr = NULL; diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c index 362816118d8..9b05da17a6e 100644 --- a/usr.sbin/ypserv/ypserv/ypserv_db.c +++ b/usr.sbin/ypserv/ypserv/ypserv_db.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv_db.c,v 1.29 2015/01/16 06:40:23 deraadt Exp $ */ +/* $OpenBSD: ypserv_db.c,v 1.30 2015/12/08 07:16:33 mmcc Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -301,8 +301,7 @@ ypdb_open_db(domainname domain, mapname map, ypstat *status, if (d == NULL || d->domain == NULL) { yplog(" ypdb_open_db: MALLOC failed"); ypdb_close(db); - if (d) - free(d); + free(d); return(NULL); } LIST_INIT(&d->dmaps); @@ -320,8 +319,7 @@ ypdb_open_db(domainname domain, mapname map, ypstat *status, if (m) m->map = strdup(map); if (m == NULL || m->map == NULL) { - if (m) - free(m); + free(m); yplog(" ypdb_open_db: MALLOC failed"); ypdb_close(db); return(NULL); |