diff --git a/ChangeLog b/ChangeLog
index 849905ed..69d9f944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 17 17:41:41 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* HTMLparser.c: try to get rid of parser loops for good.
+
 Wed Oct 17 13:29:02 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: fixed some bugs in CFLAGS passing.
diff --git a/HTMLparser.c b/HTMLparser.c
index 4b0193ea..f263dbf6 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2396,6 +2396,12 @@ htmlParseCharData(htmlParserCtxtPtr ctxt) {
 		    ctxt->sax->characters(ctxt->userData, buf, nbchar);
 	    }
 	}
+    } else {
+	/*
+	 * Loop detection
+	 */
+	if (cur == 0)
+	    ctxt->instate = XML_PARSER_EOF;
     }
 }