diff --git a/ChangeLog b/ChangeLog
index 00f2d905..3bd2807d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 12 15:41:09 CEST 2007 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: fix bug #414846 where invalid characters in attributes
+	  would sometimes not be detected.
+	* test/errors/attr4.xml result/errors/attr4.xml*: added a specific
+	  test case to the regression tests
+
 Tue Jun 12 14:23:24 CEST 2007 Daniel Veillard <daniel@veillard.com>
 
 	* xstc/Makefile.am: apply patch from Ryan Hill to cope with changes
diff --git a/parser.c b/parser.c
index f99dafe1..d79e0b04 100644
--- a/parser.c
+++ b/parser.c
@@ -3074,7 +3074,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
      */
     c = CUR_CHAR(l);
     while ((NXT(0) != limit) && /* checked */
-	   (c != '<')) {
+           (IS_CHAR(c)) && (c != '<')) {
 	if (c == 0) break;
 	if (c == '&') {
 	    in_space = 0;
@@ -3208,8 +3208,13 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
     if (RAW == '<') {
 	xmlFatalErr(ctxt, XML_ERR_LT_IN_ATTRIBUTE, NULL);
     } else if (RAW != limit) {
-        xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
-	               "AttValue: ' expected\n");
+	if ((c != 0) && (!IS_CHAR(c))) {
+	    xmlFatalErrMsg(ctxt, XML_ERR_INVALID_CHAR,
+			   "invalid character in attribute value\n");
+	} else {
+	    xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
+			   "AttValue: ' expected\n");
+        }
     } else
 	NEXT;
     if (attlen != NULL) *attlen = len;
diff --git a/result/errors/attr4.xml b/result/errors/attr4.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/result/errors/attr4.xml.err b/result/errors/attr4.xml.err
new file mode 100644
index 00000000..a9966d85
--- /dev/null
+++ b/result/errors/attr4.xml.err
@@ -0,0 +1,12 @@
+./test/errors/attr4.xml:1: parser error : invalid character in attribute value
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml:1: parser error : attributes construct error
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT line 1
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml:1: parser error : Extra content at the end of the document
+<ROOT attr="XY"/>
+              ^
diff --git a/result/errors/attr4.xml.str b/result/errors/attr4.xml.str
new file mode 100644
index 00000000..eeb9252f
--- /dev/null
+++ b/result/errors/attr4.xml.str
@@ -0,0 +1,10 @@
+./test/errors/attr4.xml:1: parser error : invalid character in attribute value
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml:1: parser error : attributes construct error
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT
+<ROOT attr="XY"/>
+              ^
+./test/errors/attr4.xml : failed to parse
diff --git a/test/errors/attr4.xml b/test/errors/attr4.xml
new file mode 100644
index 00000000..553bbceb
--- /dev/null
+++ b/test/errors/attr4.xml
@@ -0,0 +1 @@
+<ROOT attr="XY"/>