diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | doc/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | xmlregexp.c | 6 | ||||
| -rw-r--r-- | xstc/Makefile.am | 2 |
5 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Wed Apr 25 15:57:32 CEST 2007 Daniel Veillard <daniel@veillard.com> + + * xstc/Makefile.am doc/examples/Makefile.am Makefile.am: applied + patch from Richard Jones to for the silent flag on valgrind + when doing "make valgrind" + * xmlregexp.c: raise a regexp error when '\' is misused to escape + a standard character. + Tue Apr 24 20:15:14 CEST 2007 Daniel Veillard <daniel@veillard.com> * tree.c: Richard Jones reported xmlBufferAdd (buf, "", -1), fixing it diff --git a/Makefile.am b/Makefile.am index 66760403..d1feb948 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,7 @@ tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TES valgrind: @echo '## Running the regression tests under Valgrind' @echo '## Go get a cup of coffee it is gonna take a while ...' - $(MAKE) CHECKER='valgrind' tests + $(MAKE) CHECKER='valgrind -q' tests APItests: testapi$(EXEEXT) @echo "## Running the API regression tests this may take a little while" diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index cd9f4ef2..ea236215 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -96,7 +96,7 @@ xpath2_DEPENDENCIES= $(DEPS) xpath2_LDADD= @RDL_LIBS@ $(LDADDS) valgrind: - $(MAKE) CHECKER='valgrind' tests + $(MAKE) CHECKER='valgrind -q' tests tests: $(noinst_PROGRAMS) @(echo '## examples regression tests') diff --git a/xmlregexp.c b/xmlregexp.c index 2a30d66f..e729d574 100644 --- a/xmlregexp.c +++ b/xmlregexp.c @@ -4751,6 +4751,8 @@ xmlFAParseCharClassEsc(xmlRegParserCtxtPtr ctxt) { xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg, type, 0, 0, NULL); } + } else { + ERROR("Wrong escape sequence, misuse of character '\\'"); } } @@ -5307,6 +5309,10 @@ xmlRegexpCompile(const xmlChar *regexp) { if (CUR != 0) { ERROR("xmlFAParseRegExp: extra characters"); } + if (ctxt->error != 0) { + xmlRegFreeParserCtxt(ctxt); + return(NULL); + } ctxt->end = ctxt->state; ctxt->start->type = XML_REGEXP_START_STATE; ctxt->end->type = XML_REGEXP_FINAL_STATE; diff --git a/xstc/Makefile.am b/xstc/Makefile.am index 57e1a4a3..2fc9167c 100644 --- a/xstc/Makefile.am +++ b/xstc/Makefile.am @@ -126,7 +126,7 @@ tests: valgrind: -@(if [ -x $(PYTHON) ] ; then \ echo '## Running the regression tests under Valgrind' ; \ - $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi); + $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi); clean: rm -f $(PYSCRIPTS) test.log |