aboutsummaryrefslogtreecommitdiffstats
path: root/xmlregexp.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2007-04-25 13:55:20 +0000
committerDaniel Veillard <veillard@src.gnome.org>2007-04-25 13:55:20 +0000
commitcb4284e29641aa7dd990d42aba772b7f5c1ab50d (patch)
treecfead7421a525202381f04716de16526b2965b32 /xmlregexp.c
parentc9923324e92f0fff68ee2912fb1f0d28262bea1d (diff)
downloadandroid_external_libxml2-cb4284e29641aa7dd990d42aba772b7f5c1ab50d.tar.gz
android_external_libxml2-cb4284e29641aa7dd990d42aba772b7f5c1ab50d.tar.bz2
android_external_libxml2-cb4284e29641aa7dd990d42aba772b7f5c1ab50d.zip
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
Diffstat (limited to 'xmlregexp.c')
-rw-r--r--xmlregexp.c6
1 files changed, 6 insertions, 0 deletions
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;