mirror of
https://github.com/postgres/postgres.git
synced 2025-04-29 13:56:47 +03:00
Fix semantics of regular expression back-references.
POSIX defines the behavior of back-references thus: The back-reference expression '\n' shall match the same (possibly empty) string of characters as was matched by a subexpression enclosed between "\(" and "\)" preceding the '\n'. As far as I can see, the back-reference is supposed to consider only the data characters matched by the referenced subexpression. However, because our engine copies the NFA constructed from the referenced subexpression, it effectively enforces any constraints therein, too. As an example, '(^.)\1' ought to match 'xx', or any other string starting with two occurrences of the same character; but in our code it does not, and indeed can't match anything, because the '^' anchor constraint is included in the backref's copied NFA. If POSIX intended that, you'd think they'd mention it. Perl for one doesn't act that way, so it's hard to conclude that this isn't a bug. Fix by modifying the backref's NFA immediately after it's copied from the reference, replacing all constraint arcs by EMPTY arcs so that the constraints are treated as automatically satisfied. This still allows us to enforce matching rules that depend only on the data characters; for example, in '(^\d+).*\1' the NFA matching step will still know that the backref can only match strings of digits. Perhaps surprisingly, this change does not affect the results of any of a rather large corpus of real-world regexes. Nonetheless, I would not consider back-patching it, since it's a clear compatibility break. Patch by me, reviewed by Joel Jacobson Discussion: https://postgr.es/m/661609.1614560029@sss.pgh.pa.us
This commit is contained in:
parent
c5530d8474
commit
4aea704a5b
@ -6166,6 +6166,9 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', '\s*') AS foo;
|
||||
The subexpression must entirely precede the back reference in the RE.
|
||||
Subexpressions are numbered in the order of their leading parentheses.
|
||||
Non-capturing parentheses do not define subexpressions.
|
||||
The back reference considers only the string characters matched by the
|
||||
referenced subexpression, not any constraints contained in it. For
|
||||
example, <literal>(^\d)\1</literal> will match <literal>22</literal>.
|
||||
</para>
|
||||
|
||||
<table id="posix-character-entry-escapes-table">
|
||||
|
@ -1382,6 +1382,77 @@ duptraverse(struct nfa *nfa,
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* removeconstraints - remove any constraints in an NFA
|
||||
*
|
||||
* Constraint arcs are replaced by empty arcs, essentially treating all
|
||||
* constraints as automatically satisfied.
|
||||
*/
|
||||
static void
|
||||
removeconstraints(struct nfa *nfa,
|
||||
struct state *start, /* process subNFA starting here */
|
||||
struct state *stop) /* and stopping here */
|
||||
{
|
||||
if (start == stop)
|
||||
return;
|
||||
|
||||
stop->tmp = stop;
|
||||
removetraverse(nfa, start);
|
||||
/* done, except for clearing out the tmp pointers */
|
||||
|
||||
stop->tmp = NULL;
|
||||
cleartraverse(nfa, start);
|
||||
}
|
||||
|
||||
/*
|
||||
* removetraverse - recursive heart of removeconstraints
|
||||
*/
|
||||
static void
|
||||
removetraverse(struct nfa *nfa,
|
||||
struct state *s)
|
||||
{
|
||||
struct arc *a;
|
||||
struct arc *oa;
|
||||
|
||||
/* Since this is recursive, it could be driven to stack overflow */
|
||||
if (STACK_TOO_DEEP(nfa->v->re))
|
||||
{
|
||||
NERR(REG_ETOOBIG);
|
||||
return;
|
||||
}
|
||||
|
||||
if (s->tmp != NULL)
|
||||
return; /* already done */
|
||||
|
||||
s->tmp = s;
|
||||
for (a = s->outs; a != NULL && !NISERR(); a = oa)
|
||||
{
|
||||
removetraverse(nfa, a->to);
|
||||
if (NISERR())
|
||||
break;
|
||||
oa = a->outchain;
|
||||
switch (a->type)
|
||||
{
|
||||
case PLAIN:
|
||||
case EMPTY:
|
||||
/* nothing to do */
|
||||
break;
|
||||
case AHEAD:
|
||||
case BEHIND:
|
||||
case '^':
|
||||
case '$':
|
||||
case LACON:
|
||||
/* replace it */
|
||||
newarc(nfa, EMPTY, 0, s, a->to);
|
||||
freearc(nfa, a);
|
||||
break;
|
||||
default:
|
||||
NERR(REG_ASSERT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* cleartraverse - recursive cleanup for algorithms that leave tmp ptrs set
|
||||
*/
|
||||
|
@ -150,6 +150,8 @@ static void delsub(struct nfa *, struct state *, struct state *);
|
||||
static void deltraverse(struct nfa *, struct state *, struct state *);
|
||||
static void dupnfa(struct nfa *, struct state *, struct state *, struct state *, struct state *);
|
||||
static void duptraverse(struct nfa *, struct state *, struct state *);
|
||||
static void removeconstraints(struct nfa *, struct state *, struct state *);
|
||||
static void removetraverse(struct nfa *, struct state *);
|
||||
static void cleartraverse(struct nfa *, struct state *);
|
||||
static struct state *single_color_transition(struct state *, struct state *);
|
||||
static void specialcolors(struct nfa *);
|
||||
@ -1182,6 +1184,10 @@ parseqatom(struct vars *v,
|
||||
dupnfa(v->nfa, v->subs[subno]->begin, v->subs[subno]->end,
|
||||
atom->begin, atom->end);
|
||||
NOERR();
|
||||
|
||||
/* The backref node's NFA should not enforce any constraints */
|
||||
removeconstraints(v->nfa, atom->begin, atom->end);
|
||||
NOERR();
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -2636,6 +2636,28 @@ select * from test_regex('^(.+)( \1)+$', 'abc abc abd', 'RP');
|
||||
{2,REG_UBACKREF,REG_UNONPOSIX}
|
||||
(1 row)
|
||||
|
||||
-- back reference only matches the string, not any constraints
|
||||
select * from test_regex('(^\w+).*\1', 'abc abc abc', 'LRP');
|
||||
test_regex
|
||||
--------------------------------------------
|
||||
{1,REG_UBACKREF,REG_UNONPOSIX,REG_ULOCALE}
|
||||
{"abc abc abc",abc}
|
||||
(2 rows)
|
||||
|
||||
select * from test_regex('(^\w+\M).*\1', 'abc abcd abd', 'LRP');
|
||||
test_regex
|
||||
--------------------------------------------
|
||||
{1,REG_UBACKREF,REG_UNONPOSIX,REG_ULOCALE}
|
||||
{"abc abc",abc}
|
||||
(2 rows)
|
||||
|
||||
select * from test_regex('(\w+(?= )).*\1', 'abc abcd abd', 'HLRP');
|
||||
test_regex
|
||||
------------------------------------------------------------
|
||||
{1,REG_UBACKREF,REG_ULOOKAROUND,REG_UNONPOSIX,REG_ULOCALE}
|
||||
{"abc abc",abc}
|
||||
(2 rows)
|
||||
|
||||
-- doing 15 "octal escapes vs back references"
|
||||
-- # initial zero is always octal
|
||||
-- expectMatch 15.1 MP "a\\010b" "a\bb" "a\bb"
|
||||
|
@ -770,6 +770,11 @@ select * from test_regex('^(.+)( \1)+$', 'abc abd abc', 'RP');
|
||||
-- expectNomatch 14.29 RP {^(.+)( \1)+$} {abc abc abd}
|
||||
select * from test_regex('^(.+)( \1)+$', 'abc abc abd', 'RP');
|
||||
|
||||
-- back reference only matches the string, not any constraints
|
||||
select * from test_regex('(^\w+).*\1', 'abc abc abc', 'LRP');
|
||||
select * from test_regex('(^\w+\M).*\1', 'abc abcd abd', 'LRP');
|
||||
select * from test_regex('(\w+(?= )).*\1', 'abc abcd abd', 'HLRP');
|
||||
|
||||
-- doing 15 "octal escapes vs back references"
|
||||
|
||||
-- # initial zero is always octal
|
||||
|
Loading…
x
Reference in New Issue
Block a user