diff --git a/ChangeLog b/ChangeLog
index afa63683..225524ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 17 23:23:26 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* xmlregexp.c: applied fix from Christopher Boumenot for bug
+	  #362714 on regexps missing ']'
+
 Tue Oct 17 22:32:42 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
 	* parserInternals.c: applied patch from Marius Konitzer to avoid
diff --git a/xmlregexp.c b/xmlregexp.c
index 58f480da..e7d519eb 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -4807,6 +4807,11 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
     int start = -1;
     int end = -1;
 
+    if (CUR == '\0') {
+        ERROR("Expecting ']'");
+	return;
+    }
+
     if ((CUR == '&') && (NXT(1) == '#')) {
 	end = start = xmlFAParseCharRef(ctxt);
         xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
@@ -4897,7 +4902,7 @@ xmlFAParsePosCharGroup(xmlRegParserCtxtPtr ctxt) {
 	    xmlFAParseCharRange(ctxt);
 	}
     } while ((CUR != ']') && (CUR != '^') && (CUR != '-') &&
-	     (ctxt->error == 0));
+             (CUR != 0) && (ctxt->error == 0));
 }
 
 /**