diff -r 7e1fac6c0a9c -r f5e8cb813a4d mercurial/parsers.c
--- a/mercurial/parsers.c	Tue Dec 01 20:18:28 2015 -0600
+++ b/mercurial/parsers.c	Wed Dec 02 23:04:58 2015 +0900
@@ -493,6 +493,11 @@
 
 	/* read filenames */
 	while (pos >= 40 && pos < len) {
+		if (pos + 17 > len) {
+			PyErr_SetString(PyExc_ValueError,
+					"overflow in dirstate");
+			goto quit;
+		}
 		cur = str + pos;
 		/* unpack header */
 		state = *cur;