Fix double free when socket_accept fails

php · Nov 11, 2020 · 800cf5a · 800cf5a
1 parent b4a2a96
commit 800cf5a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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)