From owner-svn-src-all@FreeBSD.ORG  Wed Sep 16 06:32:23 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 81768106566C;
	Wed, 16 Sep 2009 06:32:23 +0000 (UTC) (envelope-from dds@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 712AB8FC15;
	Wed, 16 Sep 2009 06:32:23 +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 n8G6WNMb014371;
	Wed, 16 Sep 2009 06:32:23 GMT (envelope-from dds@svn.freebsd.org)
Received: (from dds@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8G6WNNe014369;
	Wed, 16 Sep 2009 06:32:23 GMT (envelope-from dds@svn.freebsd.org)
Message-Id: <200909160632.n8G6WNNe014369@svn.freebsd.org>
From: Diomidis Spinellis <dds@FreeBSD.org>
Date: Wed, 16 Sep 2009 06:32:23 +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: r197246 - head/lib/libc/regex
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: Wed, 16 Sep 2009 06:32:23 -0000

Author: dds
Date: Wed Sep 16 06:32:23 2009
New Revision: 197246
URL: http://svn.freebsd.org/changeset/base/197246

Log:
  Fix an off-by-one error in the marking of the O_CH operator
  following an OOR2 operator.
  
  PR:		130504
  MFC after:	2 weeks

Modified:
  head/lib/libc/regex/engine.c

Modified: head/lib/libc/regex/engine.c
==============================================================================
--- head/lib/libc/regex/engine.c	Wed Sep 16 06:29:23 2009	(r197245)
+++ head/lib/libc/regex/engine.c	Wed Sep 16 06:32:23 2009	(r197246)
@@ -1075,7 +1075,7 @@ step(struct re_guts *g,
 						OP(s = g->strip[pc+look]) != O_CH;
 						look += OPND(s))
 					assert(OP(s) == OOR2);
-				FWD(aft, aft, look);
+				FWD(aft, aft, look + 1);
 			}
 			break;
 		case OOR2:		/* propagate OCH_'s marking */