iliaa Mon Oct 20 10:22:01 2003 EDT Modified files: /php-src/ext/standard mail.c Log: Fixed bug #25923 (mail() modifies the to & subject arguments). Index: php-src/ext/standard/mail.c diff -u php-src/ext/standard/mail.c:1.78 php-src/ext/standard/mail.c:1.79 --- php-src/ext/standard/mail.c:1.78 Mon Oct 13 00:15:09 2003 +++ php-src/ext/standard/mail.c Mon Oct 20 10:22:01 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.78 2003/10/13 04:15:09 iliaa Exp $ */ +/* $Id: mail.c,v 1.79 2003/10/20 14:22:01 iliaa Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -87,6 +87,7 @@ int to_len, message_len, headers_len; int subject_len, extra_cmd_len, i; char *force_extra_parameters = INI_STR("mail_force_extra_parameters"); + char *to_r, *subject_r; if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE."); @@ -104,36 +105,40 @@ } if (to_len > 0) { + to_r = estrndup(to, to_len); for (; to_len; to_len--) { - if (!isspace((unsigned char) to[to_len - 1])) { + if (!isspace((unsigned char) to_r[to_len - 1])) { break; } - to[to_len - 1] = '\0'; + to_r[to_len - 1] = '\0'; } - for (i = 0; to[i]; i++) { - if (iscntrl((unsigned char) to[i])) { + for (i = 0; to_r[i]; i++) { + if (iscntrl((unsigned char) to_r[i])) { /* According to RFC 822, section 3.1.1 long headers may be separated into * parts using CRLF followed at least one linear-white-space character ('\t' or ' '). * To prevent these separators from being replaced with a space, we use the * SKIP_LONG_HEADER_SEP to skip over them. */ - SKIP_LONG_HEADER_SEP(to, i); - to[i] = ' '; + SKIP_LONG_HEADER_SEP(to_r, i); + to_r[i] = ' '; } } - } + } else { + to_r = to; + } if (subject_len > 0) { + subject_r = estrndup(subject, subject_len); for (; subject_len; subject_len--) { - if (!isspace((unsigned char) subject[subject_len - 1])) { + if (!isspace((unsigned char) subject_r[subject_len - 1])) { break; } - subject[subject_len - 1] = '\0'; + subject_r[subject_len - 1] = '\0'; } - for(i = 0; subject[i]; i++) { - if (iscntrl((unsigned char) subject[i])) { - SKIP_LONG_HEADER_SEP(subject, i); - subject[i] = ' '; + for(i = 0; subject_r[i]; i++) { + if (iscntrl((unsigned char) subject_r[i])) { + SKIP_LONG_HEADER_SEP(subject_r, i); + subject_r[i] = ' '; } } } @@ -144,7 +149,7 @@ extra_cmd = php_escape_shell_cmd(extra_cmd); } - if (php_mail(to, subject, message, headers, extra_cmd TSRMLS_CC)) { + if (php_mail(to_r, subject_r, message, headers, extra_cmd TSRMLS_CC)) { RETVAL_TRUE; } else { RETVAL_FALSE; @@ -152,6 +157,12 @@ if (extra_cmd) { efree (extra_cmd); + } + if (to_len > 0) { + efree(to_r); + } + if (subject_len > 0) { + efree(subject_r); } } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php