mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-5.6'
* PHP-5.6: fix TSRM Conflicts: ext/standard/dns.c
This commit is contained in:
commit
87d8e9208c
@ -247,7 +247,7 @@ PHP_FUNCTION(gethostbynamel)
|
||||
|
||||
if(hostname_len > MAXFQDNLEN) {
|
||||
/* name too long, protect from CVE-2015-0235 */
|
||||
php_error_docref(NULL, E_WARNING, "Host name is too long, the limit is %d characters", MAXFQDNLEN);
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host name is too long, the limit is %d characters", MAXFQDNLEN);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user