Fix a bug in mbrtowc_iconv(). From TAKIZAWA Takashi

<taki@luna.email.ne.jp>.

diff --git a/mbyte.c b/mbyte.c
index b64961c4f0813349654f7f41ae3f8fd5b56942b7..4a5552a66661232d69b140f0b45a8fc4a7a0707f 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -179,7 +179,7 @@ size_t mbrtowc_iconv (wchar_t *pwc, const char *s, size_t n,
       /* we have a character */
       memset (ps, 0, sizeof (*ps));
       utf8rtowc (pwc, bufo, ob - bufo, &mbstate);
-      return *pwc ? (ib - (k ? bufi + k : s)) : 0;
+      return (pwc && *pwc) ? (ib - (k ? bufi + k : s)) : 0;
     }
     else if (!r || (r == (size_t)(-1) && errno == EINVAL))
     {