From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 14 Apr 2020 14:08:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9bdbce53f8a909e35ad4a137bc94c4ebce9b450;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't leak peername if accept fails
---

e9bdbce53f8a909e35ad4a137bc94c4ebce9b450
diff --cc ext/standard/streamsfuncs.c
index e8fd16d3df,d7bacf5bd5..e3e31a76cf
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@@ -281,7 -283,10 +281,10 @@@ 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");
 +		php_error_docref(NULL, E_WARNING, "Accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error");
  		RETVAL_FALSE;
  	}