From: Jim Meyering <jim@meyering.net>
Date: Wed, 18 Oct 1995 14:31:14 +0000 (+0000)
Subject: Merge latest change from FSF.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca418a1cd52413cee14ff29e208de09cb8410aa9;p=pspp

Merge latest change from FSF.
---

diff --git a/lib/regex.c b/lib/regex.c
index ca485a896c..348bd36490 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -3265,9 +3265,10 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
     return -1;
     
   /* Fix up RANGE if it might eventually take us outside
-     the virtual concatenation of STRING1 and STRING2.  */
-  if (endpos < -1)
-    range = -1 - startpos;
+     the virtual concatenation of STRING1 and STRING2.
+     Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE.  */ 
+  if (endpos < 0)
+    range = 0 - startpos;
   else if (endpos > total_size)
     range = total_size - startpos;