cvs: php-src(PHP_5_1) / NEWS /ext/imap php_imap.c /ext/imap/tests bug35669.phpt

From: Date: Thu, 05 Jan 2006 00:47:17 +0000
Subject: cvs: php-src(PHP_5_1) / NEWS /ext/imap php_imap.c /ext/imap/tests bug35669.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-36401@lists.php.net to get a copy of this message
iliaa Thu Jan 5 00:47:17 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/imap/tests bug35669.phpt Modified files: /php-src/ext/imap php_imap.c /php-src NEWS Log: Fixed bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email). http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.3&r2=1.208.2.4&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.3 php-src/ext/imap/php_imap.c:1.208.2.4 --- php-src/ext/imap/php_imap.c:1.208.2.3 Sun Jan 1 12:50:08 2006 +++ php-src/ext/imap/php_imap.c Thu Jan 5 00:47:16 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.3 2006/01/01 12:50:08 sniper Exp $ */ +/* $Id: php_imap.c,v 1.208.2.4 2006/01/05 00:47:16 iliaa Exp $ */ #define IMAP41 @@ -2837,9 +2837,10 @@ char *cookie = NIL; ENVELOPE *env; BODY *bod=NULL, *topbod=NULL; - PART *mypart=NULL, *toppart=NULL, *part; + PART *mypart=NULL, *part; PARAMETER *param, *disp_param = NULL, *custom_headers_param = NULL, *tmp_param = NULL; char tmp[8 * MAILTMPLEN], *mystring=NULL, *t=NULL, *tempstring=NULL; + int toppart = 0; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &envelope, &body) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); @@ -2922,7 +2923,6 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter cannot be empty"); RETURN_FALSE; } - zend_hash_get_current_key(Z_ARRVAL_PP(body), &key, &ind, 0); /* FIXME: is this necessary? we're not using key/ind */ if (Z_TYPE_PP(data) == IS_ARRAY) { bod = mail_newbody(); @@ -3022,23 +3022,28 @@ zend_hash_move_forward(Z_ARRVAL_PP(body)); while (zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data) == SUCCESS) { - zend_hash_get_current_key(Z_ARRVAL_PP(body), &key, &ind, 0); /* FIXME: Is this necessary? We're not using key/ind */ if (Z_TYPE_PP(data) == IS_ARRAY) { + short type = -1; + if (zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &pvalue)== SUCCESS) { + convert_to_long_ex(pvalue); + type = (short) Z_LVAL_PP(pvalue); + } + if (!toppart) { bod->nested.part = mail_newbody_part(); mypart = bod->nested.part; - toppart = mypart; - bod=&mypart->body; + toppart = 1; } else { - mypart->next = mail_newbody_part(); - mypart = mypart->next; - bod = &mypart->body; + mypart->next = mail_newbody_part(); + mypart = mypart->next; } - if (zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &pvalue)== SUCCESS) { - convert_to_long_ex(pvalue); - bod->type = (short) Z_LVAL_PP(pvalue); - } + bod = &mypart->body; + + if (type != TYPEMULTIPART) { + bod->type = type; + } + if (zend_hash_find(Z_ARRVAL_PP(data), "encoding", sizeof("encoding"), (void **) &pvalue)== SUCCESS) { convert_to_long_ex(pvalue); bod->encoding = (short) Z_LVAL_PP(pvalue); @@ -3135,12 +3140,6 @@ goto done; } - if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot generate multipart e-mail without components."); - RETVAL_FALSE; - goto done; - } - rfc822_encode_body_7bit(env, topbod); rfc822_header (tmp, env, topbod); http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.338&r2=1.2027.2.339&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.338 php-src/NEWS:1.2027.2.339 --- php-src/NEWS:1.2027.2.338 Wed Jan 4 21:31:29 2006 +++ php-src/NEWS Thu Jan 5 00:47:16 2006 @@ -22,6 +22,8 @@ - Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty). (Andrey) - Fixed bug #35751 (using date with a timestamp makes httpd segfault). (Derick) +- Fixed bug #35669 (imap_mail_compose() crashes with + multipart-multiboundary-email). (Ilia) - Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg) - Fixed bug #35377 (PDO_SQLITE: undefined reference to "fdatasync"). (Nuno, Jani) http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/tests/bug35669.phpt?view=markup&rev=1.1 Index: php-src/ext/imap/tests/bug35669.phpt +++ php-src/ext/imap/tests/bug35669.phpt

« previous php.cvs (#36401) next »