Skip to content

Commit 93d89cb

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
2 parents 487f248 + e3f0d03 commit 93d89cb

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

ext/sockets/sockets.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ PHP_FUNCTION(socket_read)
921921
PHP_FUNCTION(socket_getsockname)
922922
{
923923
zval *arg1, *addr, *port = NULL;
924-
php_sockaddr_storage sa_storage;
924+
php_sockaddr_storage sa_storage = {0};
925925
php_socket *php_sock;
926926
struct sockaddr *sa;
927927
struct sockaddr_in *sin;
@@ -998,7 +998,7 @@ PHP_FUNCTION(socket_getsockname)
998998
PHP_FUNCTION(socket_getpeername)
999999
{
10001000
zval *arg1, *arg2, *arg3 = NULL;
1001-
php_sockaddr_storage sa_storage;
1001+
php_sockaddr_storage sa_storage = {0};
10021002
php_socket *php_sock;
10031003
struct sockaddr *sa;
10041004
struct sockaddr_in *sin;

ext/sockets/tests/gh13603.phpt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
GH-13603 - socket_getsockname - invalid characters
3+
--EXTENSIONS--
4+
sockets
5+
--FILE--
6+
<?php
7+
$socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
8+
socket_bind($socket, 'sn.socp');
9+
socket_listen($socket);
10+
socket_getsockname($socket, $address);
11+
var_dump($address);
12+
socket_close($socket);
13+
unlink($address);
14+
--EXPECT--
15+
string(7) "sn.socp"

0 commit comments

Comments
 (0)