Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 912e49019635 · 2020-04-14T16:08:07.000+02:00
* PHP-7.3:
  Don't leak peername if accept fails
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
@@ -283,6 +283,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
`@@ -283,6 +283,9 @@ PHP_FUNCTION(stream_socket_accept)`
`283`	`283`	`}`
`284`	`284`	`php_stream_to_zval(clistream, return_value);`
`285`	`285`	`} else {`
	`286`	`+ if (peername) {`
	`287`	`+ zend_string_release(peername);`
	`288`	`+ }`
`286`	`289`	`php_error_docref(NULL, E_WARNING, "accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error");`
`287`	`290`	`RETVAL_FALSE;`
`288`	`291`	`}`