iliaa Wed Jun 8 19:51:06 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/iconv iconv.c
Log:
MFH: Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3
in length).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.428&r2=1.1760.2.429&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.428 php-src/NEWS:1.1760.2.429
--- php-src/NEWS:1.1760.2.428 Wed Jun 8 09:20:57 2005
+++ php-src/NEWS Wed Jun 8 19:51:05 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33268 (iconv_strlen() works only with a parameter of < 3 in
+ length). (Ilia)
- Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry)
- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.117.2.5&r2=1.117.2.6&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.117.2.5 php-src/ext/iconv/iconv.c:1.117.2.6
--- php-src/ext/iconv/iconv.c:1.117.2.5 Wed Mar 23 18:08:24 2005
+++ php-src/ext/iconv/iconv.c Wed Jun 8 19:51:05 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.117.2.5 2005/03/23 23:08:24 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.117.2.6 2005/06/08 23:51:05 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
