From owner-svn-src-user@FreeBSD.ORG  Mon Aug 22 23:15:15 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7A0A106566B;
	Mon, 22 Aug 2011 23:15:15 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D772A8FC08;
	Mon, 22 Aug 2011 23:15:15 +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 p7MNFFAP072341;
	Mon, 22 Aug 2011 23:15:15 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7MNFFNk072339;
	Mon, 22 Aug 2011 23:15:15 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108222315.p7MNFFNk072339@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 22 Aug 2011 23:15:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225092 - user/gabor/tre-integration/contrib/tre/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2011 23:15:16 -0000

Author: gabor
Date: Mon Aug 22 23:15:15 2011
New Revision: 225092
URL: http://svn.freebsd.org/changeset/base/225092

Log:
  - Fix offsets for heuristics with prefix and end segment

Modified:
  user/gabor/tre-integration/contrib/tre/lib/regexec.c

Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/regexec.c	Mon Aug 22 21:10:50 2011	(r225091)
+++ user/gabor/tre-integration/contrib/tre/lib/regexec.c	Mon Aug 22 23:15:15 2011	(r225092)
@@ -221,13 +221,14 @@ tre_match(const tre_tnfa_t *tnfa, const 
 	  /* Look for the end of possibly matching text. */
 	  ret = tre_match_fast(heur->end, string, len - st - n, type,
 			       nmatch, pmatch, eflags);
+	  n += pmatch[0].rm_eo;
 
 	  if (ret != REG_OK)
 	    return ret;
 
 	  SEEK_TO(st);
 
-	  ret = tre_match(tnfa, string, pmatch[0].rm_eo + n,
+	  ret = tre_match(tnfa, string, n,
 			  type, nmatch, pmatch, eflags, NULL, NULL);
 
 	  FIX_OFFSETS;