From 466fcdaa33258cf3633887222146b891d202cc6c Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 27 Aug 2012 12:03:40 +0800 Subject: Avoid a potential infinite recursion Which can happen when eliminating epsilon transitions, as reported by Pavel Madr --- xmlregexp.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xmlregexp.c') diff --git a/xmlregexp.c b/xmlregexp.c index b9527085..493bfc7e 100644 --- a/xmlregexp.c +++ b/xmlregexp.c @@ -222,6 +222,7 @@ struct _xmlRegTrans { struct _xmlAutomataState { xmlRegStateType type; xmlRegMarkedType mark; + xmlRegMarkedType markd; xmlRegMarkedType reached; int no; int maxTrans; @@ -2589,6 +2590,8 @@ xmlFARecurseDeterminism(xmlRegParserCtxtPtr ctxt, xmlRegStatePtr state, if (state == NULL) return(ret); + if (state->markd == XML_REGEXP_MARK_VISITED) + return(ret); if (ctxt->flags & AM_AUTOMATA_RNG) deep = 0; @@ -2606,8 +2609,10 @@ xmlFARecurseDeterminism(xmlRegParserCtxtPtr ctxt, xmlRegStatePtr state, if (t1->atom == NULL) { if (t1->to < 0) continue; + state->markd = XML_REGEXP_MARK_VISITED; res = xmlFARecurseDeterminism(ctxt, ctxt->states[t1->to], to, atom); + state->markd = 0; if (res == 0) { ret = 0; /* t1->nd = 1; */ -- cgit v1.2.1