diff --git a/ChangeLog b/ChangeLog
index b1984e69..38c5a2a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar  4 16:14:42 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* doc/* : rebuilt the docs
+	* parser.c: final patch on #6766
+	* valid.c: small patch on validity checks.
+
 Sat Mar  4 12:38:41 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* doc/upgrade.html: instruction on how to upgrade from 1.x to 2.x
diff --git a/parser.c b/parser.c
index 81071680..bd32ef4b 100644
--- a/parser.c
+++ b/parser.c
@@ -8320,8 +8320,8 @@ xmlRecoverFile(const char *filename) {
 
 /**
  * xmlCreateMemoryParserCtxt :
- * @buffer:  an pointer to a char array
- * @size:  the size of the array
+ * @buffer:  an pointer to a zero terminated char array
+ * @size:  the size of the array (without the trailing 0)
  *
  * Create a parser context for an XML in-memory document.
  *
@@ -8334,7 +8334,7 @@ xmlCreateMemoryParserCtxt(char *buffer, int size) {
     xmlCharEncoding enc;
 
     if (buffer[size] != '\0')
-	buffer[size] = '\0';
+	return(NULL);
 
     ctxt = xmlNewParserCtxt();
     if (ctxt == NULL) {