svn commit: r244778 - head/lib/libutil
Baptiste Daroussin
bapt at FreeBSD.org
Fri Dec 28 20:21:15 UTC 2012
Author: bapt
Date: Fri Dec 28 20:21:14 2012
New Revision: 244778
URL: http://svnweb.freebsd.org/changeset/base/244778
Log:
malloc() sets errno to ENOMEM already.
Submitted by: Christoph Mallon <christoph.mallon at gmx.de>
Modified:
head/lib/libutil/gr_util.c
Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c Fri Dec 28 20:19:54 2012 (r244777)
+++ head/lib/libutil/gr_util.c Fri Dec 28 20:21:14 2012 (r244778)
@@ -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);
}
More information about the svn-src-head
mailing list