From 20a67b75e7b8c2ba418edc9eac092d332dd39741 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 10 Feb 2005 09:38:11 +0000 Subject: [PATCH] fix crash on /\(\)/x 2005-02-10 Paolo Bonzini * lib/regcomp.c (lower_subexp): Do not optimize empty subexpressions even with REG_NOSUB. * testsuite/SPENCER.tests: Add a previously failing testcase. git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-43 --- lib/regcomp.c | 5 +++++ lib/regex_internal.h | 1 + testsuite/SPENCER.tests | 1 + 3 files changed, 7 insertions(+) diff --git a/lib/regcomp.c b/lib/regcomp.c index 1a5f795..4fe5d5c 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1321,6 +1321,11 @@ lower_subexp (err, preg, node) bin_tree_t *op, *cls, *tree1, *tree; if (preg->no_sub + /* We do not optimize empty subexpressions, because otherwise we may + have bad CONCAT nodes with NULL children. This is obviously not + very common, so we do not lose much. An example that triggers + this case is the sed "script" /\(\)/x. */ + && node->left && (node->token.opr.idx >= 8 * sizeof (dfa->used_bkref_map) || !(dfa->used_bkref_map & (1 << node->token.opr.idx)))) return node->left; diff --git a/lib/regex_internal.h b/lib/regex_internal.h index f065cf4..299c6e9 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -629,6 +629,7 @@ struct re_dfa_t int nbackref; /* The number of backreference in this dfa. */ /* Bitmap expressing which backreference is used. */ + unsigned int empty_bkref_map; unsigned int used_bkref_map; unsigned int completed_bkref_map; diff --git a/testsuite/SPENCER.tests b/testsuite/SPENCER.tests index a8b6e4b..b84a270 100644 --- a/testsuite/SPENCER.tests +++ b/testsuite/SPENCER.tests @@ -376,6 +376,7 @@ a(b?c)+d - accd accd a[bc]d - xyzaaabcaababdacd abd a[ab]c - aaabc abc abc s abc abc +() s abc @abc a* & b @b # Let's have some fun -- try to match a C comment.