diff --git a/ChangeLog b/ChangeLog
index e455054c..ecba195c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 11 18:29:18 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: fixed a bug in one corner case of attribute parsing.
+
 Thu Sep 11 16:21:53 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in doc/* : 2.6.0beta1 changes
diff --git a/parser.c b/parser.c
index 397d26b1..ddf4bd81 100644
--- a/parser.c
+++ b/parser.c
@@ -7613,7 +7613,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *len, int *alloc,
 	/*
 	 * skip the trailing blanks
 	 */
-	while (last[-1] == 0x20) last--;
+	while ((last[-1] == 0x20) && (last > start)) last--;
 	while ((in < end) && (*in != limit) && 
 	       ((*in == 0x20) || (*in == 0x9) ||
 	        (*in == 0xA) || (*in == 0xD))) {