--- rxvt-unicode/src/misc.C	2007/10/31 09:55:23	1.49
+++ rxvt-unicode/src/misc.C	2009/04/26 01:59:53	1.53
@@ -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,7 +167,7 @@
   return r;
 }
 
-char *
+const char *
 rxvt_basename (const char *str) NOTHROW
 {
   char *base = strrchr (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;
@@ -305,5 +308,35 @@
   free (cs);
 }
 
+void *
+rxvt_malloc (size_t size)
+{
+  void *p = malloc (size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}
 
+void *
+rxvt_calloc (size_t number, size_t size)
+{
+  void *p = calloc (number, size);
 
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}
+
+void *
+rxvt_realloc (void *ptr, size_t size)
+{
+  void *p = realloc (ptr, size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}