diff src/regex.c @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 0293115a14e9
line wrap: on
line diff
--- a/src/regex.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/src/regex.c	Mon Aug 13 08:46:35 2007 +0200
@@ -1042,7 +1042,9 @@
    This is a variable only so users of regex can assign to it; we never
    change it ourselves.  */
 #if defined (MATCH_MAY_ALLOCATE)
-int re_max_failures = 200000;
+/* 4400 was enough to cause a crash on Alpha OSF/1,
+   whose default stack limit is 2mb.  */
+int re_max_failures = 4000;
 #else
 int re_max_failures = 2000;
 #endif
@@ -2660,7 +2662,7 @@
             default:
             normal_backslash:
               /* You might think it would be useful for \ to mean
-                 not to translate; but if we don't translate it
+                 not to translate; but if we don't translate it,
                  it will never match anything.  */
               c = TRANSLATE (c);
               goto normal_char;
@@ -3604,9 +3606,9 @@
 
 
 /* re_match_2 matches the compiled pattern in BUFP against the
-   the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
-   and SIZE2, respectively).  We start matching at POS, and stop
-   matching at STOP.
+   (virtual) concatenation of STRING1 and STRING2 (of length SIZE1 and
+   SIZE2, respectively).  We start matching at POS, and stop matching
+   at STOP.
    
    If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
    store offsets for the substring each group matched in REGS.  See the
@@ -3668,7 +3670,7 @@
      to resume scanning the pattern; the second one is where to resume
      scanning the strings.  If the latter is zero, the failure point is
      a ``dummy''; if a failure happens and the failure point is a dummy,
-     it gets discarded and the next next one is tried.  */
+     it gets discarded and the next one is tried.  */
 #ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global.  */
   fail_stack_type fail_stack;
 #endif