archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Fix memory leak on socket_sendmsg() / socket_recvmsg() error
This commit is contained in:
Nikita Popov 2020-08-05 16:42:40 +02:00
commit 25d849d40b
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/sockets/sendrecvmsg.c
View file

@ -192,14 +192,13 @@ PHP_FUNCTION(socket_sendmsg)
res = sendmsg(php_sock->bsd_socket, msghdr, (int)flags);
if (res != -1) {
zend_llist_destroy(allocations);
efree(allocations);
RETURN_LONG((zend_long)res);
RETVAL_LONG((zend_long)res);
} else {
PHP_SOCKET_ERROR(php_sock, "error in sendmsg", errno);
RETURN_FALSE;
RETVAL_FALSE;
}
allocations_dispose(&allocations);
}
PHP_FUNCTION(socket_recvmsg)
@ -246,7 +245,6 @@ PHP_FUNCTION(socket_recvmsg)
/* we don;t need msghdr anymore; free it */
msghdr = NULL;
allocations_dispose(&allocations);
zval_ptr_dtor(zmsg);
if (!err.has_error) {
@ -257,14 +255,15 @@ PHP_FUNCTION(socket_recvmsg)
/* no need to destroy/free zres -- it's NULL in this circumstance */
assert(zres == NULL);
}
RETVAL_LONG((zend_long)res);
} else {
SOCKETS_G(last_error) = errno;
php_error_docref(NULL, E_WARNING, "Error in recvmsg [%d]: %s",
errno, sockets_strerror(errno));
RETURN_FALSE;
RETVAL_FALSE;
}
RETURN_LONG((zend_long)res);
allocations_dispose(&allocations);
}
PHP_FUNCTION(socket_cmsg_space)

15
ext/sockets/tests/socket_sendrecvmsg_error.phpt Normal file
View file

@ -0,0 +1,15 @@
--TEST--
Error during socket_sendmsg() or socket_recvmsg()
--FILE--
<?php
$socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
socket_sendmsg($socket, [], -1);
$message = ['controllen' => 1];
socket_recvmsg($socket, $message, -1);
?>
--EXPECTF--
Warning: socket_sendmsg(): error in sendmsg [%d]: %a in %s on line %d
Warning: socket_recvmsg(): Error in recvmsg [%d]: %a in %s on line %d