From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 20 Mar 2001 09:54:36 +0000 (+0000)
Subject: Fix a bug in mbrtowc_iconv().  From TAKIZAWA Takashi
X-Git-Tag: mutt-1-3-17-rel~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=936df5d92a40d6e3deee8bf4fb3185f119e7e4f3;p=mutt

Fix a bug in mbrtowc_iconv().  From TAKIZAWA Takashi
<taki@luna.email.ne.jp>.
---

diff --git a/mbyte.c b/mbyte.c
index b64961c4..4a5552a6 100644
--- 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))
     {