From: tasn Date: Tue, 8 Feb 2011 13:22:10 +0000 (+0000) Subject: Evas encoding: Improved evas_common_encoding_utf8_get_len to be more consistent with... X-Git-Tag: accepted/2.0/20130306.225542~242^2~1056 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=158c516155da79a990da7575eaaf33eaa0db8e7f;p=profile%2Fivi%2Fevas.git Evas encoding: Improved evas_common_encoding_utf8_get_len to be more consistent with evas_common_encoding_utf8_get_next. This is a semi fix to the issue with malformed utf8 strings (#670) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56806 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/engines/common/evas_encoding.c b/src/lib/engines/common/evas_encoding.c index 2d2a842..96a2690 100644 --- a/src/lib/engines/common/evas_encoding.c +++ b/src/lib/engines/common/evas_encoding.c @@ -236,14 +236,11 @@ EAPI int evas_common_encoding_utf8_get_len(const char *buf) { /* returns the number of utf8 characters (not bytes) in the string */ - int index = 0, len = 0; + int i = 0, len = 0; + + while (evas_common_encoding_utf8_get_next(buf, &i)) + len++; - while (buf[index]) - { - if ((buf[index] & 0xc0) != 0x80) - len++; - index++; - } return len; }