com php-src: Move strlen() check to php_mail_detect_multi ple_crlf(): ext/standard/mail.c

Commit: d263ecd8640697d6cde4b71ec722e8a2e5022dcf Author: Yasuo Ohgaki <yohgaki@php.net> Fri, 19 Jun 2015 15:17:56 +0900 Parents: dacea3f6fb3f84c79a3412b24547eb2c636754f6 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d263ecd8640697d6cde4b71ec722e8a2e5022dcf Log: Move strlen() check to php_mail_detect_multiple_crlf() Changed paths: M ext/standard/mail.c Diff: diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 1c1332b..aa29a22 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -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); }