From owner-svn-src-head@FreeBSD.ORG  Mon Mar 19 00:45:02 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 52EDB106564A;
	Mon, 19 Mar 2012 00:45:02 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 390138FC0A;
	Mon, 19 Mar 2012 00:45:02 +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 q2J0j2tX042833;
	Mon, 19 Mar 2012 00:45:02 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2J0j2QY042832;
	Mon, 19 Mar 2012 00:45:02 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201203190045.q2J0j2QY042832@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 19 Mar 2012 00:45:01 +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: r233137 - head/bin/expr
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: Mon, 19 Mar 2012 00:45:02 -0000

Author: eadler
Date: Mon Mar 19 00:45:01 2012
New Revision: 233137
URL: http://svn.freebsd.org/changeset/base/233137

Log:
  rm[0].rm_so must be zero (an explicit check is made for zero in the
  outer if condition)
  
  Reviewed by:	se
  Approved by:	cperciva

Modified:
  head/bin/expr/expr.y

Modified: head/bin/expr/expr.y
==============================================================================
--- head/bin/expr/expr.y	Mon Mar 19 00:41:40 2012	(r233136)
+++ head/bin/expr/expr.y	Mon Mar 19 00:45:01 2012	(r233137)
@@ -540,7 +540,7 @@ op_colon(struct val *a, struct val *b)
 			v = make_str(a->u.s + rm[1].rm_so);
 
 		} else
-			v = make_integer((intmax_t)(rm[0].rm_eo - rm[0].rm_so));
+			v = make_integer((intmax_t)(rm[0].rm_eo));
 	else
 		if (rp.re_nsub == 0)
 			v = make_integer((intmax_t)0);