From owner-svn-src-head@FreeBSD.ORG  Wed Dec 26 23:14:34 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8A68DC34;
 Wed, 26 Dec 2012 23:14:34 +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 6D47D8FC08;
 Wed, 26 Dec 2012 23:14:34 +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 qBQNEYia060910;
 Wed, 26 Dec 2012 23:14:34 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQNEY35060909;
 Wed, 26 Dec 2012 23:14:34 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212262314.qBQNEY35060909@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Dec 2012 23:14:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244720 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 26 Dec 2012 23:14:34 -0000

Author: bapt
Date: Wed Dec 26 23:14:33 2012
New Revision: 244720
URL: http://svnweb.freebsd.org/changeset/base/244720

Log:
  Fix off-by-one error in memory allocation: j entries, one new and a null
  terminator is j + 2.
  
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Modified:
  head/usr.sbin/pw/pw_user.c

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Wed Dec 26 22:21:27 2012	(r244719)
+++ head/usr.sbin/pw/pw_user.c	Wed Dec 26 23:14:33 2012	(r244720)
@@ -756,7 +756,7 @@ pw_user(struct userconf * cnf, int mode,
 			if (grp->gr_mem[j] != NULL) /* user already member of group */
 				continue;
 
-			members = malloc(sizeof(char *) * (j + 1));
+			members = malloc(sizeof(char *) * (j + 2));
 			for (j = 0; grp->gr_mem[j] != NULL; j++)
 				members[j] = grp->gr_mem[j];