php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 03:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move strlen() check to php_mail_detect_multiple_crlf()

Browse Source
This commit is contained in:
Yasuo Ohgaki
2015-06-19 15:17:56 +09:00
parent dacea3f6fb
commit d263ecd864
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/mail.c
View File

@@ -225,7 +225,7 @@ static int php_mail_detect_multiple_crlf(char *hdr) {
/* This function detects multiple/malformed multiple newlines. */
size_t len;
if (!hdr) {
if (!hdr || !strlen(hdr)) {
return 0;
}
@@ -320,7 +320,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
efree(f);
}
if (hdr && strlen(hdr) && php_mail_detect_multiple_crlf(hdr)) {
if (hdr && php_mail_detect_multiple_crlf(hdr)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Multiple or malformed newlines found in additional_header");
MAIL_RET(0);
}