From: Jani Taskinen Date: Mon, 4 Aug 2008 21:16:22 +0000 (+0000) Subject: MFH:- Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter) X-Git-Tag: php-5.2.7RC1~145 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c078127291dc507084e50d4696d393a2b789d7fd;p=php MFH:- Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter) --- diff --git a/NEWS b/NEWS index bc8b8d3e78..a2cdeb5e0f 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ PHP NEWS - Fixed a regression when using strip_tags() and < is within an attribute. (Scott) +- Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter). + (Jani) - Fixed bug #45691 (Some per-dir or runtime settings may leak into other requests). (Moriyoshi) - Fixed bug #45568 (ISAPI doesn't properly clear auth_digest in header). diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 59660dbddc..b7851f7bd5 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -2157,7 +2157,8 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist) zval **str, **defaulthost, *tovals; ADDRESS *addresstmp; ENVELOPE *env; - + char *str_copy; + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &str, &defaulthost) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } @@ -2168,7 +2169,10 @@ PHP_FUNCTION(imap_rfc822_parse_adrlist) env = mail_newenvelope(); - rfc822_parse_adrlist(&env->to, Z_STRVAL_PP(str), Z_STRVAL_PP(defaulthost)); + /* rfc822_parse_adrlist() modifies passed string. Copy it. */ + str_copy = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str)); + rfc822_parse_adrlist(&env->to, str_copy, defaulthost); + efree(str_copy); array_init(return_value); @@ -2964,7 +2968,7 @@ PHP_FUNCTION(imap_mail_compose) BODY *bod=NULL, *topbod=NULL; PART *mypart=NULL, *part; PARAMETER *param, *disp_param = NULL, *custom_headers_param = NULL, *tmp_param = NULL; - char *tmp=NULL, *mystring=NULL, *t=NULL, *tempstring=NULL; + char *tmp=NULL, *mystring=NULL, *t=NULL, *tempstring=NULL, *str_copy = NULL; int toppart = 0; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &envelope, &body) == FAILURE) { @@ -2981,50 +2985,55 @@ PHP_FUNCTION(imap_mail_compose) RETURN_FALSE; } +#define PHP_RFC822_PARSE_ADRLIST(target, value) \ + str_copy = estrndup(Z_STRVAL_PP(value), Z_STRLEN_PP(value)); \ + rfc822_parse_adrlist(target, str_copy, "NO HOST"); \ + efree(str_copy); + env = mail_newenvelope(); if (zend_hash_find(Z_ARRVAL_PP(envelope), "remail", sizeof("remail"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - env->remail=cpystr(Z_STRVAL_PP(pvalue)); + env->remail = cpystr(Z_STRVAL_PP(pvalue)); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "return_path", sizeof("return_path"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue) - rfc822_parse_adrlist(&env->return_path, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->return_path, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "date", sizeof("date"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - env->date=cpystr(Z_STRVAL_PP(pvalue)); + env->date = cpystr(Z_STRVAL_PP(pvalue)); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "from", sizeof("from"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - rfc822_parse_adrlist (&env->from, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->from, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "reply_to", sizeof("reply_to"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - rfc822_parse_adrlist (&env->reply_to, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->reply_to, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "in_reply_to", sizeof("in_reply_to"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - env->in_reply_to=cpystr(Z_STRVAL_PP(pvalue)); + env->in_reply_to = cpystr(Z_STRVAL_PP(pvalue)); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "subject", sizeof("subject"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - env->subject=cpystr(Z_STRVAL_PP(pvalue)); + env->subject = cpystr(Z_STRVAL_PP(pvalue)); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "to", sizeof("to"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - rfc822_parse_adrlist (&env->to, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->to, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "cc", sizeof("cc"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - rfc822_parse_adrlist (&env->cc, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->cc, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "bcc", sizeof("bcc"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - rfc822_parse_adrlist (&env->bcc, Z_STRVAL_PP(pvalue), "NO HOST"); + PHP_RFC822_PARSE_ADRLIST(&env->bcc, pvalue); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "message_id", sizeof("message_id"), (void **) &pvalue)== SUCCESS) { convert_to_string_ex(pvalue); - env->message_id=cpystr(Z_STRVAL_PP(pvalue)); + env->message_id = cpystr(Z_STRVAL_PP(pvalue)); } if (zend_hash_find(Z_ARRVAL_PP(envelope), "custom_headers", sizeof("custom_headers"), (void **) &pvalue)== SUCCESS) { diff --git a/ext/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt new file mode 100644 index 0000000000..eedaed0817 --- /dev/null +++ b/ext/imap/tests/bug45705_1.phpt @@ -0,0 +1,20 @@ +--TEST-- +Bug #45705 test #1 (imap rfc822_parse_adrlist() modifies passed address parameter) +--SKIPIF-- + +--FILE-- +'; +var_dump($address); +imap_rfc822_parse_adrlist($address, null); +var_dump($address); + +?> +--EXPECT-- +string(27) "John Doe " +string(27) "John Doe " diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt new file mode 100644 index 0000000000..797d473178 --- /dev/null +++ b/ext/imap/tests/bug45705_2.phpt @@ -0,0 +1,53 @@ +--TEST-- +Bug #45705 test #2 (imap rfc822_parse_adrlist() modifies passed address parameter) +--SKIPIF-- + +--FILE-- + 'John Doe ', + 'from' => 'John Doe ', + 'reply_to' => 'John Doe ', + 'to' => 'John Doe ', + 'cc' => 'John Doe ', + 'bcc' => 'John Doe ', +); + +var_dump($envelope); +imap_mail_compose($envelope, array(1 => array())); +var_dump($envelope); + +?> +--EXPECT-- +array(6) { + ["return_path"]=> + string(27) "John Doe " + ["from"]=> + string(27) "John Doe " + ["reply_to"]=> + string(27) "John Doe " + ["to"]=> + string(27) "John Doe " + ["cc"]=> + string(27) "John Doe " + ["bcc"]=> + string(27) "John Doe " +} +array(6) { + ["return_path"]=> + string(27) "John Doe " + ["from"]=> + string(27) "John Doe " + ["reply_to"]=> + string(27) "John Doe " + ["to"]=> + string(27) "John Doe " + ["cc"]=> + string(27) "John Doe " + ["bcc"]=> + string(27) "John Doe " +}