Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 31 Aug 2011 23:14:37 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r225299 - user/gabor/tre-integration/contrib/tre/lib
Message-ID:  <201108312314.p7VNEbKb021290@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108312314.p7VNEbKb021290>