--- rxvt-unicode/src/rxvtfont.C	2007/09/20 15:32:34	1.119
+++ rxvt-unicode/src/rxvtfont.C	2007/10/28 11:25:04	1.121
@@ -514,7 +514,7 @@
   if (XGetFontProperty (f, property, &value))
     return XGetAtomName (term->dpy, value);
   else
-    return rxvt_strdup (repl);
+    return repl ? strdup (repl) : 0;
 }
 
 rxvt_fontprop
@@ -1060,7 +1060,7 @@
              const text_t *text, int len,
              int fg, int bg);
 
-  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
+  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
 
 protected:
   XftFont *f;