fix crash on /\(\)/x
2005-02-10 Paolo Bonzini <bonzini@gnu.org> * 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
This commit is contained in:
1 parent
93f1e336c3
commit
20a67b75e7
3 files changed
+7
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in new issue
Block a user