applied patch from Richard Jones to for the silent flag on valgrind when
* 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.
Daniel
svn path=/trunk/; revision=3606
diff --git a/ChangeLog b/ChangeLog
index 8556a6c..3e3871f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6676040..d1feb94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,7 +167,7 @@
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 cd9f4ef..ea23621 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -96,7 +96,7 @@
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 2a30d66..e729d57 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -4751,6 +4751,8 @@
xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
type, 0, 0, NULL);
}
+ } else {
+ ERROR("Wrong escape sequence, misuse of character '\\'");
}
}
@@ -5307,6 +5309,10 @@
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 57e1a4a..2fc9167 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -126,7 +126,7 @@
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