Merge branch 'PHP-7.4'

nikic · nikic · commit e9bdbce53f8a · 2020-04-14T16:08:43.000+02:00
* PHP-7.4:
  Don't leak peername if accept fails
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
@@ -281,6 +281,9 @@ PHP_FUNCTION(stream_socket_accept)
 		}
 		php_stream_to_zval(clistream, return_value);
 	} else {
+		if (peername) {
+			zend_string_release(peername);
+		}
 		php_error_docref(NULL, E_WARNING, "Accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error");
 		RETVAL_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,9 @@ PHP_FUNCTION(stream_socket_accept)`
`281`	`281`	`}`
`282`	`282`	`php_stream_to_zval(clistream, return_value);`
`283`	`283`	`} else {`
	`284`	`+ if (peername) {`
	`285`	`+ zend_string_release(peername);`
	`286`	`+ }`
`284`	`287`	`php_error_docref(NULL, E_WARNING, "Accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error");`
`285`	`288`	`RETVAL_FALSE;`
`286`	`289`	`}`