iliaa Tue Jan 18 11:33:28 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/imap php_imap.c
Log:
MFH: Fixed bug #31480 (Possible infinite loop in imap_mail_compose()).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.194&r2=1.1760.2.195&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.194 php-src/NEWS:1.1760.2.195
--- php-src/NEWS:1.1760.2.194 Tue Jan 18 10:48:38 2005
+++ php-src/NEWS Tue Jan 18 11:33:27 2005
@@ -4,6 +4,7 @@
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Added length and charsetnr for field array and object in mysqli. (Georg)
- Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values).
(Georg)
+- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen).
(Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
non-existent object ref). (Tony)
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.10&r2=1.184.2.11&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.10
php-src/ext/imap/php_imap.c:1.184.2.11
--- php-src/ext/imap/php_imap.c:1.184.2.10 Mon Jan 10 23:56:44 2005
+++ php-src/ext/imap/php_imap.c Tue Jan 18 11:33:28 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.184.2.10 2005/01/11 04:56:44 sniper Exp $ */
+/* $Id: php_imap.c,v 1.184.2.11 2005/01/18 16:33:28 iliaa Exp $ */
#define IMAP41
@@ -3089,7 +3089,7 @@
bod->contents.text.size = Z_STRLEN_PP(pvalue);
} else {
bod->contents.text.data = (char *) fs_get(1);
- bod->contents.text.data = "";
+ memcpy(bod->contents.text.data, "", 1);
bod->contents.text.size = 0;
}
if (zend_hash_find(Z_ARRVAL_PP(data), "lines",
sizeof("lines"), (void **) &pvalue)== SUCCESS) {
@@ -3104,9 +3104,8 @@
convert_to_string_ex(pvalue);
bod->md5 = cpystr(Z_STRVAL_PP(pvalue));
}
-
- zend_hash_move_forward(Z_ARRVAL_PP(body));
}
+ zend_hash_move_forward(Z_ARRVAL_PP(body));
}
rfc822_encode_body_7bit(env, topbod);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
