cvs: php-src /ext/imap php_imap.c

iliaa Tue Jan 18 11:32:54 2005 EDT Modified files: /php-src/ext/imap php_imap.c Log: Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.196&r2=1.197&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.196 php-src/ext/imap/php_imap.c:1.197 --- php-src/ext/imap/php_imap.c:1.196 Mon Jan 10 23:56:06 2005 +++ php-src/ext/imap/php_imap.c Tue Jan 18 11:32:53 2005 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.196 2005/01/11 04:56:06 sniper Exp $ */ +/* $Id: php_imap.c,v 1.197 2005/01/18 16:32:53 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);