Merge branch 'PHP-8.0'

nikic · nikic · commit 01de00073f16 · 2020-11-11T12:48:44.000+01:00
* PHP-8.0:
  Fix double free when socket_accept fails
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -272,7 +272,6 @@ static int php_accept_connect(php_socket *in_sock, php_socket *out_sock, struct
 
 	if (IS_INVALID_SOCKET(out_sock)) {
 		PHP_SOCKET_ERROR(out_sock, "unable to accept incoming connection", errno);
-		efree(out_sock);
 		return 0;
 	}
 
diff --git a/ext/sockets/tests/socket_accept_failure.phpt b/ext/sockets/tests/socket_accept_failure.phpt
@@ -0,0 +1,12 @@
+--TEST--
+socket_accept() failure
+--FILE--
+<?php
+
+$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+var_dump(socket_accept($socket));
+
+?>
+--EXPECTF--
+Warning: socket_accept(): unable to accept incoming connection [%d]: %s in %s on line %d
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,6 @@ static int php_accept_connect(php_socket in_sock, php_socket out_sock, struct`
`272`	`272`
`273`	`273`	`if (IS_INVALID_SOCKET(out_sock)) {`
`274`	`274`	`PHP_SOCKET_ERROR(out_sock, "unable to accept incoming connection", errno);`
`275`		`- efree(out_sock);`
`276`	`275`	`return 0;`
`277`	`276`	`}`
`278`	`277`