--- a/mercurial/dirstate.py	Mon May 25 10:44:37 2009 -0500
+++ b/mercurial/dirstate.py	Mon May 25 12:48:15 2009 -0500
@@ -75,6 +75,8 @@
             st = self._opener("dirstate").read(40)
             if len(st) == 40:
                 return st[:20], st[20:40]
+            if len(st) < 40:
+                raise util.Abort(_('working directory state appears damaged!'))
         except IOError, err:
             if err.errno != errno.ENOENT: raise
         return [nullid, nullid]