--- rxvt-unicode/src/command.C	2008/02/19 10:47:03	1.414
+++ rxvt-unicode/src/command.C	2008/04/26 03:37:18	1.415
@@ -2326,7 +2326,10 @@
         }
 
       if (len == (size_t)-1)
-        return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+        {
+          mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
+          return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+        }
 
       // assume wchar == unicode
       cmdbuf_ptr += len;