com php-src: Move strlen() check to php_mail_detect_multi ple_crlf(): ext/standard/mail.c
| From: | Ferenc Kovacs | Date: | Thu, 09 Jul 2015 09:25:33 +0000 |
| Subject: | com php-src: Move strlen() check to php_mail_detect_multi ple_crlf(): ext/standard/mail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87894@lists.php.net to get a copy of this message | ||
Commit: 57747d08e777970c9cfe866b7e4acf5227f17772
Author: Yasuo Ohgaki <yohgaki@php.net> Fri, 19 Jun 2015 15:17:56 +0900
Committer: Ferenc Kovacs <tyrael@php.net> Thu, 9 Jul 2015 11:25:33 +0200
Parents: 145c6167619b7a2102843d4363337b55bc9916ff
Branches: PHP-5.6.11
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57747d08e777970c9cfe866b7e4acf5227f17772
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 6803f4d..a1f1906 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -226,7 +226,7 @@ void php_mail_log_to_file(char *filename, char *message, size_t message_size TSR
static int php_mail_detect_multiple_crlf(char *hdr) {
/* This function detects multiple/malformed multiple newlines. */
- if (!hdr) {
+ if (!hdr || !strlen(hdr)) {
return 0;
}
@@ -329,7 +329,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);
}