From owner-svn-src-head@FreeBSD.ORG  Thu Jan  5 23:08:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E98A0106564A;
	Thu,  5 Jan 2012 23:08:11 +0000 (UTC)
	(envelope-from ghelmer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D7F308FC19;
	Thu,  5 Jan 2012 23:08:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05N8BGp060522;
	Thu, 5 Jan 2012 23:08:11 GMT (envelope-from ghelmer@svn.freebsd.org)
Received: (from ghelmer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05N8BUx060520;
	Thu, 5 Jan 2012 23:08:11 GMT (envelope-from ghelmer@svn.freebsd.org)
Message-Id: <201201052308.q05N8BUx060520@svn.freebsd.org>
From: Guy Helmer <ghelmer@FreeBSD.org>
Date: Thu, 5 Jan 2012 23:08:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229668 - head/usr.bin/newgrp
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 23:08:12 -0000

Author: ghelmer
Date: Thu Jan  5 23:08:11 2012
New Revision: 229668
URL: http://svn.freebsd.org/changeset/base/229668

Log:
  Fix a memory leak in addgroup() by ensuring the allocated memory
  is freed if an error occurs.
  
  PR:		bin/161510
  MFC after:	4 weeks

Modified:
  head/usr.bin/newgrp/newgrp.c

Modified: head/usr.bin/newgrp/newgrp.c
==============================================================================
--- head/usr.bin/newgrp/newgrp.c	Thu Jan  5 22:48:36 2012	(r229667)
+++ head/usr.bin/newgrp/newgrp.c	Thu Jan  5 23:08:11 2012	(r229668)
@@ -190,7 +190,7 @@ addgroup(const char *grpname)
 		err(1, "malloc");
 	if ((ngrps = getgroups(ngrps_max, (gid_t *)grps)) < 0) {
 		warn("getgroups");
-		return;
+		goto end;
 	}
 
 	/* Remove requested gid from supp. list if it exists. */
@@ -204,7 +204,7 @@ addgroup(const char *grpname)
 		if (setgroups(ngrps, (const gid_t *)grps) < 0) {
 			PRIV_END;
 			warn("setgroups");
-			return;
+			goto end;
 		}
 		PRIV_END;
 	}
@@ -213,7 +213,7 @@ addgroup(const char *grpname)
 	if (setgid(grp->gr_gid)) {
 		PRIV_END;
 		warn("setgid");
-		return;
+		goto end;
 	}
 	PRIV_END;
 	grps[0] = grp->gr_gid;
@@ -228,12 +228,12 @@ addgroup(const char *grpname)
 			if (setgroups(ngrps, (const gid_t *)grps)) {
 				PRIV_END;
 				warn("setgroups");
-				return;
+				goto end;
 			}
 			PRIV_END;
 		}
 	}
-
+end:
 	free(grps);
 }