iliaa Tue Apr 5 10:49:11 2005 EDT
Modified files: (Branch: PHP_4_3)
/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.1247.2.870&r2=1.1247.2.871&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.870 php-src/NEWS:1.1247.2.871
--- php-src/NEWS:1.1247.2.870 Mon Apr 4 12:30:41 2005
+++ php-src/NEWS Tue Apr 5 10:49:09 2005
@@ -3,6 +3,8 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
+ (Ilia)
- Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony)
- Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer).
(adam dot greenfield at gmail dot com)
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.42&r2=1.142.2.43&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.42
php-src/ext/imap/php_imap.c:1.142.2.43
--- php-src/ext/imap/php_imap.c:1.142.2.42 Tue Jan 25 09:23:37 2005
+++ php-src/ext/imap/php_imap.c Tue Apr 5 10:49:10 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.42 2005/01/25 14:23:37 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.142.2.43 2005/04/05 14:49:10 iliaa Exp $ */
#define IMAP41
@@ -3015,7 +3015,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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
