diff options
| author | Aron Xu <aron@debian.org> | 2015-09-21 22:58:06 +0800 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2015-09-21 22:58:06 +0800 |
| commit | 2ee13d9e464a1f5daccaff58f5d09d36b7c4f667 (patch) | |
| tree | b022967f880b7fb1e56c8cc4c3f200d6ffbc9efd /xmlregexp.c | |
| parent | 7300193becde71a344c8ac0973dc290fa24d800d (diff) | |
| download | libxml2-upstream.tar.gz | |
Revert "Imported Upstream version 2.9.1+dfsg1"upstream
This reverts commit 7300193becde71a344c8ac0973dc290fa24d800d.
Diffstat (limited to 'xmlregexp.c')
| -rw-r--r-- | xmlregexp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmlregexp.c b/xmlregexp.c index 1f9911c..3e912ab 100644 --- a/xmlregexp.c +++ b/xmlregexp.c @@ -3162,8 +3162,10 @@ xmlFARegExecRollBack(xmlRegExecCtxtPtr exec) { exec->status = -6; return; } - memcpy(exec->counts, exec->rollbacks[exec->nbRollbacks].counts, + if (exec->counts) { + memcpy(exec->counts, exec->rollbacks[exec->nbRollbacks].counts, exec->comp->nbCounters * sizeof(int)); + } } #ifdef DEBUG_REGEXP_EXEC @@ -4091,7 +4093,7 @@ rollback: */ exec->determinist = 0; xmlFARegExecRollBack(exec); - if (exec->status == 0) { + if ((exec->inputStack != NULL ) && (exec->status == 0)) { value = exec->inputStack[exec->index].value; data = exec->inputStack[exec->index].data; #ifdef DEBUG_PUSH @@ -4306,7 +4308,7 @@ xmlRegExecGetValues(xmlRegExecCtxtPtr exec, int err, (*nbval)++; } } else { - if ((exec->comp->states[trans->to] != NULL) && + if ((exec->comp != NULL) && (exec->comp->states[trans->to] != NULL) && (exec->comp->states[trans->to]->type != XML_REGEXP_SINK_STATE)) { if (atom->neg) @@ -5707,8 +5709,6 @@ xmlAutomataNewTransition(xmlAutomataPtr am, xmlAutomataStatePtr from, if (atom == NULL) return(NULL); atom->data = data; - if (atom == NULL) - return(NULL); atom->valuep = xmlStrdup(token); if (xmlFAGenerateTransitions(am, from, to, atom) < 0) { |