c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #319897, problem with counted atoms when the transition itself is

Browse Source 
* xmlregexp.c: fix bug #319897, problem with counted atoms
  when the transition itself is counted too
* result/regexp/hard test/regexp/hard: augmented the regression
  tests with the problem exposed.
Daniel
This commit is contained in:
Daniel Veillard 2005-11-01 15:24:02 +00:00
parent 3d6aa10d8c
commit fc6eca0d81
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Nov 1 16:22:29 CET 2005 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c: fix bug #319897, problem with counted atoms
when the transition itself is counted too
* result/regexp/hard test/regexp/hard: augmented the regression
tests with the problem exposed.
Tue Nov 1 11:54:39 CET 2005 Daniel Veillard <daniel@veillard.com>
* win32/Makefile.mingw include/win32config.h: applied patch from

5
result/regexp/hard
View File

@ -5,3 +5,8 @@ aaabbbb: Ok
a0b: Ok
aa0aaa: Fail
b0aaa: Ok
Regexp: (\d{1,3}\.){3}\d{1,3}
1.2.3.4: Ok
1.22.333.44: Ok
1.2.3: Fail
1..2.3: Fail

5
test/regexp/hard
View File

@ -5,3 +5,8 @@ aaabbbb
a0b
aa0aaa
b0aaa
=>(\d{1,3}\.){3}\d{1,3}
1.2.3.4
1.22.333.44
1.2.3
1..2.3

14
xmlregexp.c
View File

@ -2812,7 +2812,15 @@ xmlFARegExec(xmlRegexpPtr comp, const xmlChar *content) {
/*
* this is a multiple input sequence
* If there is a counter associated increment it now.
* before potentially saving and rollback
*/
if (trans->counter >= 0) {
#ifdef DEBUG_REGEXP_EXEC
printf("Increasing count %d\n", trans->counter);
#endif
exec->counts[trans->counter]++;
}
if (exec->state->nbTrans > exec->transno + 1) {
xmlFARegExecSave(exec);
}
@ -2862,6 +2870,12 @@ xmlFARegExec(xmlRegexpPtr comp, const xmlChar *content) {
if (ret == 0) {
goto rollback;
}
if (trans->counter >= 0) {
#ifdef DEBUG_REGEXP_EXEC
printf("Decreasing count %d\n", trans->counter);
#endif
exec->counts[trans->counter]--;
}
} else if ((ret == 0) && (atom->min == 0) && (atom->max > 0)) {
/*
* we don't match on the codepoint, but minOccurs of 0