From owner-svn-src-user@FreeBSD.ORG  Wed Aug 31 23:14:38 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 1E4891065670;
	Wed, 31 Aug 2011 23:14:38 +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 0DA4F8FC0A;
	Wed, 31 Aug 2011 23:14:38 +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 p7VNEbha021293;
	Wed, 31 Aug 2011 23:14:37 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7VNEbKb021290;
	Wed, 31 Aug 2011 23:14:37 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108312314.p7VNEbKb021290@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 31 Aug 2011 23:14:37 +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: r225299 - 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: Wed, 31 Aug 2011 23:14:38 -0000

Author: gabor
Date: Wed Aug 31 23:14:37 2011
New Revision: 225299
URL: http://svn.freebsd.org/changeset/base/225299

Log:
  - Fix REG_PEND length calculation

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

Modified: user/gabor/tre-integration/contrib/tre/lib/fastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Wed Aug 31 23:04:24 2011	(r225298)
+++ user/gabor/tre-integration/contrib/tre/lib/fastmatch.c	Wed Aug 31 23:14:37 2011	(r225299)
@@ -125,10 +125,11 @@ tre_fixcomp(fastmatch_t *preg, const cha
 
   if (cflags & REG_PEND)
     {
-      len = (preg->re_endp >= regex)
-        ? preg->re_endp - regex
-        : 0;
-     return tre_fixncomp(preg, regex, len ? strlen(regex) : 0, cflags);
+      if (preg->re_endp >= regex)
+	len = preg->re_endp - regex
+      else
+	len = preg ? strlen(regex) : 0;
+     return tre_fixncomp(preg, regex, len, cflags);
    }
   else
     return tre_fixncomp(preg, regex, regex ? strlen(regex) : 0, cflags);

Modified: user/gabor/tre-integration/contrib/tre/lib/regcomp.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/regcomp.c	Wed Aug 31 23:04:24 2011	(r225298)
+++ user/gabor/tre-integration/contrib/tre/lib/regcomp.c	Wed Aug 31 23:14:37 2011	(r225299)
@@ -116,10 +116,12 @@ tre_regcomp(regex_t *preg, const char *r
 
   if (cflags & REG_PEND)
     {
-      len = (preg->re_endp >= regex)
-	? preg->re_endp - regex
-	: 0;
-     return tre_regncomp(preg, regex, len ? strlen(regex) : 0, cflags);
+      if (preg->re_endp >= regex)
+	len = preg->re_endp - regex
+      else
+	len = regex ? strlen(regex) : 0;
+      )
+     return tre_regncomp(preg, regex, len, cflags);
    }
   else
     return tre_regncomp(preg, regex, regex ? strlen(regex) : 0, cflags);