From owner-svn-src-head@FreeBSD.ORG  Sun Dec 26 13:41:54 2010
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 4EBE4106564A;
	Sun, 26 Dec 2010 13:41:54 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E9788FC08;
	Sun, 26 Dec 2010 13:41:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBQDfsx6087590;
	Sun, 26 Dec 2010 13:41:54 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBQDfsZc087588;
	Sun, 26 Dec 2010 13:41:54 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201012261341.oBQDfsZc087588@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 26 Dec 2010 13:41:54 +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: r216707 - head/bin/sh
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: Sun, 26 Dec 2010 13:41:54 -0000

Author: jilles
Date: Sun Dec 26 13:41:53 2010
New Revision: 216707
URL: http://svn.freebsd.org/changeset/base/216707

Log:
  sh: Fix integer overflow check, it checked an uninitialized variable.

Modified:
  head/bin/sh/memalloc.c

Modified: head/bin/sh/memalloc.c
==============================================================================
--- head/bin/sh/memalloc.c	Sun Dec 26 13:25:47 2010	(r216706)
+++ head/bin/sh/memalloc.c	Sun Dec 26 13:41:53 2010	(r216707)
@@ -231,7 +231,7 @@ growstackblock(int min)
 
 	if (min < stacknleft)
 		min = stacknleft;
-	if (newlen >= INT_MAX / 2 - ALIGN(sizeof(struct stack_block)))
+	if (min >= INT_MAX / 2 - ALIGN(sizeof(struct stack_block)))
 		error("Out of space");
 	min += stacknleft;
 	min += ALIGN(sizeof(struct stack_block));