More iconv-related patches from EGE.

1 files changed, 3 insertions, 2 deletions

diff --git a/mbyte.c b/mbyte.c
index 2d99389e..ee6eab56 100644
--- a/mbyte.c
+++ b/mbyte.c
@@ -22,12 +22,13 @@ void mutt_set_charset (char *charset)
 
 int wctomb (char *s, wchar_t wc)
 {
+  if (!s)
+    return 0;
   if (Charset_is_utf8)
     return mutt_wctoutf8 (s, wc);
   else if (wc < 0x100)
   {
-    if (s)
-      *s = wc;
+    *s = wc;
     return 1;
   }
   else