summaryrefslogtreecommitdiff
path: root/pcre/pcre_dfa_exec.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-05-04 22:19:22 +0200
committerSergei Golubchik <serg@mariadb.org>2015-05-04 22:19:22 +0200
commitc4cc91cdc9a236c22749c9c9decd7d190d0eb7fa (patch)
treead8f69084ba5857fefe80d951d5092a5dd23b497 /pcre/pcre_dfa_exec.c
parent553b437d3835764f260df43c74b2e50dacda9c54 (diff)
downloadmariadb-git-c4cc91cdc9a236c22749c9c9decd7d190d0eb7fa.tar.gz
8.37
Diffstat (limited to 'pcre/pcre_dfa_exec.c')
-rw-r--r--pcre/pcre_dfa_exec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pcre/pcre_dfa_exec.c b/pcre/pcre_dfa_exec.c
index 87f4aef9ab1..170ce6a0016 100644
--- a/pcre/pcre_dfa_exec.c
+++ b/pcre/pcre_dfa_exec.c
@@ -2736,9 +2736,10 @@ for (;;)
condcode == OP_DNRREF)
return PCRE_ERROR_DFA_UCOND;
- /* The DEFINE condition is always false */
+ /* The DEFINE condition is always false, and the assertion (?!) is
+ converted to OP_FAIL. */
- if (condcode == OP_DEF)
+ if (condcode == OP_DEF || condcode == OP_FAIL)
{ ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
/* The only supported version of OP_RREF is for the value RREF_ANY,