--- src/lib/libc/citrus/modules/citrus_utf8.c	2008/04/10 10:21:02	1.2
+++ src/lib/libc/citrus/modules/citrus_utf8.c	2008/05/20 21:13:39	1.3
@@ -243,6 +243,7 @@ _citrus_UTF8_mbrtowc_priv(_UTF8EncodingI
 	}
 	if (pwc != NULL)
 		*pwc = wchar;
+	*nresult = (wchar == 0) ? 0 : s0 - *s;
 	*s = s0;
 	psenc->chlen = 0;