From owner-svn-src-stable@FreeBSD.ORG  Tue Feb 26 00:44:55 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2011E242;
 Tue, 26 Feb 2013 00:44:55 +0000 (UTC)
 (envelope-from markj@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 073801A8;
 Tue, 26 Feb 2013 00:44:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1Q0isUD088973;
 Tue, 26 Feb 2013 00:44:54 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1Q0isnC088972;
 Tue, 26 Feb 2013 00:44:54 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201302260044.r1Q0isnC088972@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 26 Feb 2013 00:44:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247294 - stable/9/usr.bin/grep/regex
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Feb 2013 00:44:55 -0000

Author: markj
Date: Tue Feb 26 00:44:54 2013
New Revision: 247294
URL: http://svnweb.freebsd.org/changeset/base/247294

Log:
  MFC r246917:
    Strengthen the check in IS_OUT_OF_BOUNDS to ensure that (j - 1) is a
    valid index into the input buffer.
  
  Approved by:	rstone (co-mentor)

Modified:
  stable/9/usr.bin/grep/regex/tre-fastmatch.c
Directory Properties:
  stable/9/usr.bin/grep/   (props changed)

Modified: stable/9/usr.bin/grep/regex/tre-fastmatch.c
==============================================================================
--- stable/9/usr.bin/grep/regex/tre-fastmatch.c	Tue Feb 26 00:43:01 2013	(r247293)
+++ stable/9/usr.bin/grep/regex/tre-fastmatch.c	Tue Feb 26 00:44:54 2013	(r247294)
@@ -103,7 +103,7 @@ static int	fastcmp(const fastmatch_t *fg
   ((!fg->reversed							\
     ? ((type == STR_WIDE) ? ((j + fg->wlen) > len)			\
 			  : ((j + fg->len) > len))			\
-    : (j < 0)))
+    : (j <= 0)))
 
 /*
  * Checks whether the new position after shifting in the input string