cvs: php-src /ext/imap php_imap.c
| From: | Ilia Alshanetsky | Date: | Tue, 05 Apr 2005 14:47:48 +0000 |
| Subject: | cvs: php-src /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31245@lists.php.net to get a copy of this message | ||
iliaa Tue Apr 5 10:47:48 2005 EDT
Modified files:
/php-src/ext/imap php_imap.c
Log:
Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.204&r2=1.205&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.204 php-src/ext/imap/php_imap.c:1.205
--- php-src/ext/imap/php_imap.c:1.204 Sun Feb 20 13:23:33 2005
+++ php-src/ext/imap/php_imap.c Tue Apr 5 10:47:47 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.204 2005/02/20 18:23:33 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.205 2005/04/05 14:47:47 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;