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

ext/sockets: socket_recvfrom() improve error message when port argument is missing

Browse Source
This commit is contained in:
Gina Peter Banyard
2025-10-05 13:11:19 +01:00
parent 4e562f49f3
commit fd1c3660ca
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ext/sockets/sockets.c
View File

@@ -18,6 +18,7 @@
+----------------------------------------------------------------------+
*/
#include "zend_exceptions.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -1580,7 +1581,11 @@ PHP_FUNCTION(socket_recvfrom)
if (arg6 == NULL) {
zend_string_efree(recv_buf);
WRONG_PARAM_COUNT;
zend_throw_exception(
zend_ce_argument_count_error,
"socket_recvfrom() expects exactly 6 arguments when argument #1 ($socket) is of type AF_INET or AF_INET6",
0);
RETURN_THROWS();
}
retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen);
@@ -1607,7 +1612,11 @@ PHP_FUNCTION(socket_recvfrom)
if (arg6 == NULL) {
zend_string_efree(recv_buf);
WRONG_PARAM_COUNT;
zend_throw_exception(
zend_ce_argument_count_error,
"socket_recvfrom() expects exactly 6 arguments when argument #1 ($socket) is of type AF_INET or AF_INET6",
0);
RETURN_THROWS();
}
retval = recvfrom(php_sock->bsd_socket, ZSTR_VAL(recv_buf), arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen);

2
ext/sockets/tests/socket_recvfrom_ipv4_missing_port_arg.phpt
View File

@@ -14,4 +14,4 @@ try {
?>
--EXPECT--
ArgumentCountError: Wrong parameter count for socket_recvfrom()
ArgumentCountError: socket_recvfrom() expects exactly 6 arguments when argument #1 ($socket) is of type AF_INET or AF_INET6

2
ext/sockets/tests/socket_recvfrom_ipv6_missing_port_arg.phpt
View File

@@ -18,4 +18,4 @@ try {
?>
--EXPECT--
ArgumentCountError: Wrong parameter count for socket_recvfrom()
ArgumentCountError: socket_recvfrom() expects exactly 6 arguments when argument #1 ($socket) is of type AF_INET or AF_INET6