lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

regexp: Fix cycle check in xmlFAReduceEpsilonTransitions

Browse Source 
The visited flag must only be reset after the first call to
xmlFAReduceEpsilonTransitions has finished. Visiting states multiple
times could lead to unnecessary processing of duplicate transitions.

Similar to 68eadabd.
This commit is contained in:
Nick Wellnhofer
2023-03-09 05:25:09 +01:00
parent 4f49017e37
commit 9f7b114232
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
xmlregexp.c
View File

@@ -1864,7 +1864,32 @@ xmlFAReduceEpsilonTransitions(xmlRegParserCtxtPtr ctxt, int fromnr,
}
}
}
}
/**
* xmlFAFinishReduceEpsilonTransitions:
* @ctxt: a regexp parser context
* @fromnr: the from state
* @tonr: the to state
* @counter: should that transition be associated to a counted
*
*/
static void
xmlFAFinishReduceEpsilonTransitions(xmlRegParserCtxtPtr ctxt, int tonr) {
int transnr;
xmlRegStatePtr to;
to = ctxt->states[tonr];
if ((to->mark == XML_REGEXP_MARK_START) ||
(to->mark == XML_REGEXP_MARK_NORMAL))
return;
to->mark = XML_REGEXP_MARK_NORMAL;
for (transnr = 0;transnr < to->nbTrans;transnr++) {
xmlRegTransPtr t1 = &to->trans[transnr];
if ((t1->to >= 0) && (t1->atom == NULL))
xmlFAFinishReduceEpsilonTransitions(ctxt, t1->to);
}
}
/**
@@ -2016,6 +2041,7 @@ xmlFAEliminateEpsilonTransitions(xmlRegParserCtxtPtr ctxt) {
state->mark = XML_REGEXP_MARK_START;
xmlFAReduceEpsilonTransitions(ctxt, statenr,
newto, state->trans[transnr].counter);
xmlFAFinishReduceEpsilonTransitions(ctxt, newto);
state->mark = XML_REGEXP_MARK_NORMAL;
#ifdef DEBUG_REGEXP_GRAPH
} else {