From owner-svn-src-all@FreeBSD.ORG  Thu Jul 30 05:36:32 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26BDD106564A;
	Thu, 30 Jul 2009 05:36:32 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 141B98FC16;
	Thu, 30 Jul 2009 05:36:32 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6U5aVaD093285;
	Thu, 30 Jul 2009 05:36:31 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6U5aVrM093284;
	Thu, 30 Jul 2009 05:36:31 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <200907300536.n6U5aVrM093284@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Thu, 30 Jul 2009 05:36:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195969 - stable/7/usr.sbin/jexec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 30 Jul 2009 05:36:32 -0000

Author: jamie
Date: Thu Jul 30 05:36:31 2009
New Revision: 195969
URL: http://svn.freebsd.org/changeset/base/195969

Log:
  Preset errno to zero before calling strtol(), so the check afterwards will
  be valid.  This is required since the malloc call from r195859 leaves
  errno in an unknown state.
  
  For STABLE-7 only, as CURRENT doesn't make this strtol call.
  
  Reported by:	Michael Butler
  Approved by:	bz (mentor)

Modified:
  stable/7/usr.sbin/jexec/jexec.c

Modified: stable/7/usr.sbin/jexec/jexec.c
==============================================================================
--- stable/7/usr.sbin/jexec/jexec.c	Thu Jul 30 00:57:54 2009	(r195968)
+++ stable/7/usr.sbin/jexec/jexec.c	Thu Jul 30 05:36:31 2009	(r195969)
@@ -248,6 +248,7 @@ main(int argc, char *argv[])
 	if (argc < 2)
 		usage();
 	if (strlen(argv[0]) > 0) {
+		errno = 0;
 		jid = (int)strtol(argv[0], NULL, 10);
 		if (errno)
 			err(1, "Unable to parse jail ID.");