cvs: php-src(PHP_5_0) / NEWS /ext/imap php_imap.c

iliaa Tue Apr 5 10:48:29 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/imap php_imap.c Log: MFH: Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.309&r2=1.1760.2.310&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.309 php-src/NEWS:1.1760.2.310 --- php-src/NEWS:1.1760.2.309 Mon Apr 4 14:53:00 2005 +++ php-src/NEWS Tue Apr 5 10:48:26 2005 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2005, PHP 5.0.5 +- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). + (Ilia) - Fixed bug #32560 (configure looks for incorrect db2 library). (Tony) - Fixed bug #32530 (chunk_split() does not append endstr if chunklen is longer then the original string). (Ilia) http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.17&r2=1.184.2.18&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.184.2.17 php-src/ext/imap/php_imap.c:1.184.2.18 --- php-src/ext/imap/php_imap.c:1.184.2.17 Tue Jan 25 09:22:13 2005 +++ php-src/ext/imap/php_imap.c Tue Apr 5 10:48:28 2005 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.184.2.17 2005/01/25 14:22:13 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.184.2.18 2005/04/05 14:48:28 iliaa Exp $ */ #define IMAP41 @@ -3045,7 +3045,8 @@ if (zend_hash_find(Z_ARRVAL_PP(data), "charset", sizeof("charset"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); tmp_param = mail_newbody_parameter(); - tmp_param->value = cpystr(Z_STRVAL_PP(pvalue)); + tmp_param->value = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1); + memcpy(disp_param->value, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1); tmp_param->attribute = "CHARSET"; tmp_param->next = bod->parameter; bod->parameter = tmp_param;