From 66dfcf4efb68ace12d46e5a71a169ed8e8f432b8 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 25 Dec 2008 03:33:41 +0000
Subject: test/regex/tst-regex2.c: fix the rest of testsuite failures
---
libc/misc/regex/regex_old.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
(limited to 'libc')
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index e2824eda5..6bdd07f14 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -6099,7 +6099,18 @@ byte_re_match_2_internal (
{ /* No. So allocate them with malloc. We need one
extra element beyond `num_regs' for the `-1' marker
GNU code uses. */
- regs->num_regs = MIN (RE_NREGS, num_regs + 1);
+// regex specs say:
+// "If REGS_UNALLOCATED, allocate space in the regs structure
+// for max(RE_NREGS, re_nsub + 1) groups"
+// but real-world testsuites fail with contrived examples
+// with lots of groups.
+// I don't see why we can't just allocate exact needed number.
+// Incidentally, it makes RE_NREGS unused.
+//
+// regs->num_regs = MAX (RE_NREGS, num_regs + 1); - VERY WRONG
+// regs->num_regs = MIN (RE_NREGS, num_regs + 1); - slightly less wrong
+// good one which passes uclibc test/regex/tst-regex2.c:
+ regs->num_regs = num_regs + 1;
regs->start = TALLOC (regs->num_regs, regoff_t);
regs->end = TALLOC (regs->num_regs, regoff_t);
if (regs->start == NULL || regs->end == NULL)
--
cgit v1.2.3