php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Fix double free when socket_accept fails
This commit is contained in:
Nikita Popov
2020-11-11 12:48:44 +01:00
parent d637f0dd3e 800cf5a20f
commit 01de00073f
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/sockets/sockets.c
View File

@@ -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;
}

12
ext/sockets/tests/socket_accept_failure.phpt Normal file
View File

@@ -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)