From owner-svn-src-releng@freebsd.org  Thu Aug  6 01:39:24 2015
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26FFB9B1F86;
 Thu,  6 Aug 2015 01:39:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18912B6B;
 Thu,  6 Aug 2015 01:39:24 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t761dNDP050532;
 Thu, 6 Aug 2015 01:39:23 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t761dNfq050531;
 Thu, 6 Aug 2015 01:39:23 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201508060139.t761dNfq050531@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 6 Aug 2015 01:39:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r286357 - releng/10.2/usr.sbin/pw
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Aug 2015 01:39:24 -0000

Author: gjb
Date: Thu Aug  6 01:39:23 2015
New Revision: 286357
URL: https://svnweb.freebsd.org/changeset/base/286357

Log:
  MFS r286340 (bapt):
    Fix segfault in pw(8) when modifying the UID of
    a user.
  
  PR:		202111
  Approved by:	re (delphij)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.2/usr.sbin/pw/pw_user.c
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/usr.sbin/pw/pw_user.c
==============================================================================
--- releng/10.2/usr.sbin/pw/pw_user.c	Wed Aug  5 22:31:41 2015	(r286356)
+++ releng/10.2/usr.sbin/pw/pw_user.c	Thu Aug  6 01:39:23 2015	(r286357)
@@ -388,7 +388,7 @@ pw_user(int mode, char *name, long id, s
 			edited = 1;
 		}
 
-		if (id > 0 && isdigit((unsigned char)*arg->val)) {
+		if (id > 0) {
 			pwd->pw_uid = (uid_t)id;
 			edited = 1;
 			if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)