From: Yasuo Ohgaki <yohgaki@php.net>
Date: Fri, 19 Jun 2015 06:17:56 +0000 (+0900)
Subject: Move strlen() check to php_mail_detect_multiple_crlf()
X-Git-Tag: php-5.4.43~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d263ecd8640697d6cde4b71ec722e8a2e5022dcf;p=php

Move strlen() check to php_mail_detect_multiple_crlf()
---

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 1c1332b55e..aa29a22c85 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);
 	}