diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:34:44 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:34:44 -0800 |
| commit | 55d5811f85d8ef5934a430ef6d3604c942a4b2d3 (patch) | |
| tree | 527572ce67e59cc7830b6a3c8b854ca72e536482 | |
| parent | 2560a21d41d168de6ebc2c5fa6654abd6566ae8a (diff) | |
| parent | d82424b46f1023906135f87ae8112bcf932bca4e (diff) | |
| download | php-git-55d5811f85d8ef5934a430ef6d3604c942a4b2d3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix TSRM
| -rw-r--r-- | ext/standard/dns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 8b93b717c6..bdfb04ce3a 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -224,7 +224,7 @@ PHP_FUNCTION(gethostbyname) 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_STRINGL(hostname, hostname_len, 1); } addr = php_gethostbyname(hostname); @@ -249,7 +249,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; } |