diff --git a/ChangeLog b/ChangeLog
index 3a71697a..ba8cb2dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug  8 15:01:51 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+	* xmlregexp.c: fixed bug #310264, basically it's about reentrancy
+	  of count based transition, when going though the counter must
+	  be reset to 0
+	* test/schemas/bug310264* result/schemas/bug310264*: added the
+	  regression test.
+
 Mon Aug  8 14:40:52 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
 
 	* xmlschemas.c: Fixed a memory leak: xmlSchemaFreeAnnot() was
diff --git a/result/schemas/bug310264_0_0 b/result/schemas/bug310264_0_0
new file mode 100644
index 00000000..e07293d3
--- /dev/null
+++ b/result/schemas/bug310264_0_0
@@ -0,0 +1 @@
+./test/schemas/bug310264_0.xml validates
diff --git a/result/schemas/bug310264_0_0.err b/result/schemas/bug310264_0_0.err
new file mode 100644
index 00000000..e69de29b
diff --git a/test/schemas/bug310264_0.xml b/test/schemas/bug310264_0.xml
new file mode 100644
index 00000000..98f057cd
--- /dev/null
+++ b/test/schemas/bug310264_0.xml
@@ -0,0 +1,41 @@
+<c xmlns="http://myns" >
+   <a/> <!-- 1 -->
+   <a/> <!-- 2 -->
+   <a/> <!-- 3 -->
+   <a/> <!-- 4 -->
+   <a/> <!-- 5 -->
+   <a/> <!-- 6 -->
+   <a/> <!-- 7 -->
+   <a/> <!-- 8 -->
+   <a/> <!-- 9 -->
+   <a/> <!-- 10 -->
+   <a/> <!-- 1 -->
+   <a/> <!-- 2 -->
+   <a/> <!-- 3 -->
+   <a/> <!-- 4 -->
+   <a/> <!-- 5 -->
+   <a/> <!-- 6 -->
+   <a/> <!-- 7 -->
+   <a/> <!-- 8 -->
+   <a/> <!-- 9 -->
+   <a/> <!-- 20 -->
+   <a/> <!-- 1 -->
+   <a/> <!-- 2 -->
+   <a/> <!-- 3 -->
+   <a/> <!-- 4 -->
+   <a/> <!-- 5 -->
+   <a/> <!-- 6 -->
+   <a/> <!-- 7 -->
+   <a/> <!-- 8 -->
+   <a/> <!-- 9 -->
+   <a/> <!-- 30 -->
+   <a/> <!-- 1 -->
+   <a/> <!-- 2 -->
+   <a/> <!-- 3 -->
+   <a/> <!-- 4 -->
+   <a/> <!-- 5 -->
+   <a/> <!-- 6 -->
+   <a/> <!-- 7 -->
+   <a/> <!-- 8 -->
+</c>
+
diff --git a/test/schemas/bug310264_0.xsd b/test/schemas/bug310264_0.xsd
new file mode 100644
index 00000000..6f2b333c
--- /dev/null
+++ b/test/schemas/bug310264_0.xsd
@@ -0,0 +1,18 @@
+<xs:schema xmlns:tns="http://myns"
+        targetNamespace="http://myns"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+
+  <xs:element name="a" />
+
+  <xs:complexType name="c" >
+        <xs:sequence minOccurs="2" maxOccurs="4">
+             <xs:sequence minOccurs="19" maxOccurs="20">
+                  <xs:element ref="tns:a" />
+             </xs:sequence>
+        </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="c" type="tns:c" />
+
+</xs:schema>
diff --git a/xmlregexp.c b/xmlregexp.c
index 41055991..700b886f 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -38,7 +38,7 @@
 #endif
 
 /* #define DEBUG_REGEXP_GRAPH */
-/* #define DEBUG_REGEXP_EXEC */ 
+/* #define DEBUG_REGEXP_EXEC */
 /* #define DEBUG_PUSH */
 /* #define DEBUG_COMPACTION */
 
@@ -2579,6 +2579,14 @@ xmlFARegExec(xmlRegexpPtr comp, const xmlChar *content) {
 #endif
 		    exec->counts[trans->counter]++;
 		}
+		if ((trans->count >= 0) &&
+		    (trans->count < REGEXP_ALL_COUNTER)) {
+#ifdef DEBUG_REGEXP_EXEC
+		    printf("resetting count %d on transition\n",
+		           trans->count);
+#endif
+		    exec->counts[trans->count] = 0;
+		}
 #ifdef DEBUG_REGEXP_EXEC
 		printf("entering state %d\n", trans->to);
 #endif
@@ -3146,6 +3154,14 @@ xmlRegExecPushString(xmlRegExecCtxtPtr exec, const xmlChar *value,
 #endif
 		    exec->counts[trans->counter]++;
 		}
+		if ((trans->count >= 0) &&
+		    (trans->count < REGEXP_ALL_COUNTER)) {
+#ifdef DEBUG_REGEXP_EXEC
+		    printf("resetting count %d on transition\n",
+		           trans->count);
+#endif
+		    exec->counts[trans->count] = 0;
+		}
 #ifdef DEBUG_PUSH
 		printf("entering state %d\n", trans->to);
 #endif