diff --git a/ChangeLog b/ChangeLog
index 6874d1cb..8556a6c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 24 20:15:14 CEST 2007 Daniel Veillard <daniel@veillard.com>
+
+	* tree.c: Richard Jones reported xmlBufferAdd (buf, "", -1), fixing it
+
 Tue Apr 24 10:59:28 CEST 2007 Daniel Veillard <daniel@veillard.com>
 
 	* uri.c: fix xmlURIUnescapeString comments which was confusing
diff --git a/tree.c b/tree.c
index ffbcabd3..fe579219 100644
--- a/tree.c
+++ b/tree.c
@@ -6968,7 +6968,8 @@ xmlBufferAdd(xmlBufferPtr buf, const xmlChar *str, int len) {
     if (len < 0)
         len = xmlStrlen(str);
 
-    if (len <= 0) return -1;
+    if (len < 0) return -1;
+    if (len == 0) return 0;
 
     needSize = buf->use + len + 2;
     if (needSize > buf->size){