summaryrefslogtreecommitdiffstats
path: root/libutil
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-12-28 20:21:14 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-12-28 20:21:14 +0000
commita4ba8cb5d1a040d3dea01a404d49e2bee012a6b5 (patch)
tree0a4bfac16b0a0a1c1160a82ed85b20432bf457eb /libutil
parent3a3bcd13e99f20e0db107edca2d675ffb65cadc4 (diff)
downloadpw-darwin-a4ba8cb5d1a040d3dea01a404d49e2bee012a6b5.tar.gz
pw-darwin-a4ba8cb5d1a040d3dea01a404d49e2bee012a6b5.tar.zst
pw-darwin-a4ba8cb5d1a040d3dea01a404d49e2bee012a6b5.zip
malloc() sets errno to ENOMEM already.
Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
Diffstat (limited to 'libutil')
-rw-r--r--libutil/gr_util.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index 759e6e8..6676720 100644
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -505,17 +505,13 @@ gr_add(struct group *gr, char *newmember)
}
/* Allocate enough for current pointers + 1 more and NULL marker */
mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
- if ((members = malloc(mlen)) == NULL) {
+ if ((members = malloc(mlen)) == NULL)
errno = ENOMEM;
- return (NULL);
- }
memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
members[num_mem++] = newmember;
members[num_mem] = NULL;
gr->gr_mem = members;
newgr = gr_dup(gr);
- if (newgr == NULL)
- errno = ENOMEM;
free(members);
return (newgr);
}