diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-14 16:08:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-14 16:08:07 +0200 |
| commit | 912e49019635945cea01838679db6f950cd55967 (patch) | |
| tree | c8162b1cae194554adad387892dfbd7bab4abe74 | |
| parent | 2a46f3ee91a9d551202ecc9e3ad8b0f71ba4dafd (diff) | |
| parent | b56fb9019e8d5eb6576d4ce254e01fe749ca0b92 (diff) | |
| download | php-git-912e49019635945cea01838679db6f950cd55967.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't leak peername if accept fails
| -rw-r--r-- | ext/standard/streamsfuncs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index c80ac0f440..d7bacf5bd5 100644 --- 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; } |