Merge branch 'PHP-7.2'

hikari-no-yume · hikari-no-yume · commit 80d17cb088a3 · 2017-08-19T20:38:51.000+01:00
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
@@ -126,13 +126,13 @@ static zend_string *php_gethostbyname(char *name);
    Get the host name of the current machine */
 PHP_FUNCTION(gethostname)
 {
-	char buf[HOST_NAME_MAX];
+	char buf[HOST_NAME_MAX + 1];
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
-	if (gethostname(buf, sizeof(buf) - 1)) {
+	if (gethostname(buf, sizeof(buf))) {
 		php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno));
 		RETURN_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -126,13 +126,13 @@ static zend_string php_gethostbyname(char name);`
`126`	`126`	`Get the host name of the current machine */`
`127`	`127`	`PHP_FUNCTION(gethostname)`
`128`	`128`	`{`
`129`		`- char buf[HOST_NAME_MAX];`
	`129`	`+ char buf[HOST_NAME_MAX + 1];`
`130`	`130`
`131`	`131`	`if (zend_parse_parameters_none() == FAILURE) {`
`132`	`132`	`return;`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (gethostname(buf, sizeof(buf) - 1)) {`
	`135`	`+ if (gethostname(buf, sizeof(buf))) {`
`136`	`136`	`php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno));`
`137`	`137`	`RETURN_FALSE;`
`138`	`138`	`}`