rasmus Mon, 01 Mar 2010 23:49:01 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=295705
Log: Fix bug #43314 Assume worst case all-encoded case here Bug: http://bugs.php.net/43314 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_2/ext/iconv/iconv.c U php/php-src/branches/PHP_5_3/ext/iconv/iconv.c U php/php-src/trunk/ext/iconv/iconv.c Modified: php/php-src/branches/PHP_5_2/ext/iconv/iconv.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/iconv/iconv.c 2010-03-01 23:16:21 UTC (rev 295704) +++ php/php-src/branches/PHP_5_2/ext/iconv/iconv.c 2010-03-01 23:49:01 UTC (rev 295705) @@ -1278,7 +1278,7 @@ break; } - out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / (3 - 1); + out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / 3; in_left = ini_in_left; in_p = ini_in_p; } Modified: php/php-src/branches/PHP_5_3/ext/iconv/iconv.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/iconv/iconv.c 2010-03-01 23:16:21 UTC (rev 295704) +++ php/php-src/branches/PHP_5_3/ext/iconv/iconv.c 2010-03-01 23:49:01 UTC (rev 295705) @@ -1267,7 +1267,7 @@ break; } - out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / (3 - 1); + out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / 3; in_left = ini_in_left; in_p = ini_in_p; } Modified: php/php-src/trunk/ext/iconv/iconv.c =================================================================== --- php/php-src/trunk/ext/iconv/iconv.c 2010-03-01 23:16:21 UTC (rev 295704) +++ php/php-src/trunk/ext/iconv/iconv.c 2010-03-01 23:49:01 UTC (rev 295705) @@ -1331,7 +1331,7 @@ break; } - out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / (3 - 1); + out_size -= ((nbytes_required - (char_cnt - 2)) + 1) / 3; in_left = ini_in_left; in_p = ini_in_p; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
