Re: cvs: php-src /ext/iconv iconv.c

On Wed, 8 Jun 2005, Ilia Alshanetsky wrote:

iliaa Wed Jun 8 19:49:40 2005 EDT Modified files: /php-src/ext/iconv iconv.c Log: Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3 in length) http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.122&r2=1.123&ty=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.122 php-src/ext/iconv/iconv.c:1.123 --- php-src/ext/iconv/iconv.c:1.122 Wed Mar 23 18:06:38 2005 +++ php-src/ext/iconv/iconv.c Wed Jun 8 19:49:38 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.122 2005/03/23 23:06:38 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.123 2005/06/08 23:49:38 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -516,7 +516,7 @@ #endif } - out_left = 0; + errno = out_left = 0; for (in_p = str, in_left = nbytes, cnt = 0; in_left > 0; cnt+=2) { size_t prev_in_left; @@ -547,6 +547,7 @@ break; case E2BIG: + case 0: *pretval = cnt; break;

-- Donate @ http://pecl.php.net/wishlist.php/sniper