From owner-svn-src-all@FreeBSD.ORG  Fri Dec 28 20:21:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2E1DAE3E;
 Fri, 28 Dec 2012 20:21:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 12B108FC0C;
 Fri, 28 Dec 2012 20:21:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBSKLEjf096327;
 Fri, 28 Dec 2012 20:21:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBSKLEeG096326;
 Fri, 28 Dec 2012 20:21:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212282021.qBSKLEeG096326@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 28 Dec 2012 20:21:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244778 - head/lib/libutil
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 20:21:15 -0000

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