Skip to content

Commit dfff6ac

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 4671f85 + c00d7e0 commit dfff6ac

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ext/sockets/conversions.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,11 @@ void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
14591459
object_init_ex(&elem, socket_ce);
14601460
php_socket *sock = Z_SOCKET_P(&elem);
14611461

1462-
socket_import_file_descriptor(fd, sock);
1462+
if (!socket_import_file_descriptor(fd, sock)) {
1463+
do_to_zval_err(ctx, "error getting protocol descriptor %d: getsockopt() call failed with errno %d", fd, errno);
1464+
zval_ptr_dtor(&elem);
1465+
return;
1466+
}
14631467
} else {
14641468
php_stream *stream = php_stream_fopen_from_fd(fd, "rw", NULL);
14651469
php_stream_to_zval(stream, &elem);

0 commit comments

Comments
 (0)