mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 06:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #25923 (mail() modifies the to & subject arguments).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2003-10-20 14:22:01 +00:00
parent c92b0202c7
commit 21fceae7d6
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/standard/mail.c
View File

@ -87,6 +87,7 @@ PHP_FUNCTION(mail)
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 @@ PHP_FUNCTION(mail)
}
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 @@ PHP_FUNCTION(mail)
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;
@ -153,6 +158,12 @@ PHP_FUNCTION(mail)
if (extra_cmd) {
efree (extra_cmd);
}
if (to_len > 0) {
efree(to_r);
}
if (subject_len > 0) {
efree(subject_r);
}
}
/* }}} */