tony2001 Thu Dec 15 22:47:27 2005 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
fix #35692(iconv_mime_decode() segfault, with libiconv only)
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/iconv.c?r1=1.129&r2=1.130&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.129 php-src/ext/iconv/iconv.c:1.130
--- php-src/ext/iconv/iconv.c:1.129 Tue Dec 6 02:24:31 2005
+++ php-src/ext/iconv/iconv.c Thu Dec 15 22:47:27 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.129 2005/12/06 02:24:31 sniper Exp $ */
+/* $Id: iconv.c,v 1.130 2005/12/15 22:47:27 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1369,7 +1369,7 @@
if (cd == (iconv_t)(-1)) {
if ((mode &
PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR)) {
- err =
_php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word),
cd);
+ err =
_php_iconv_appendl(pretval, encoded_word, (size_t)((p1 + 1) - encoded_word),
cd_pl);
if (err !=
PHP_ICONV_ERR_SUCCESS) {
goto out;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
