--- rxvt-unicode/src/misc.C	2007/12/18 01:36:24	1.50
+++ rxvt-unicode/src/misc.C	2009/05/30 06:56:20	1.54
@@ -40,7 +40,10 @@
       ssize_t l = wcrtomb (dst, *str++, mbs);
 
       if (l < 0)
-        *dst++ = '?';
+        {
+          *dst++ = '?';
+          wcrtomb (0, 0, mbs); // reset undefined state
+        }
       else
         dst += l;
     }
@@ -164,12 +167,12 @@
   return r;
 }
 
-char *
+const char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  const char *base = strrchr (str, '/');
 
-  return (char *) (base ? base + 1 : str);
+  return base ? base + 1 : str;
 }
 
 /*
@@ -287,7 +290,7 @@
       for ( ; *t && *t != ','; t++) ;
       p = t - s;
       ret[l] = (char *)malloc (p + 1);
-      strncpy (ret[l], s, p);
+      memcpy (ret[l], s, p);
       ret[l][p] = '\0';
       rxvt_strtrim (ret[l]);
       s = ++t;