Skip to content

ext/sockets: cmsg data array elements using uint32_t type instead. #19254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2025
Merged

ext/sockets: cmsg data array elements using uint32_t type instead. #19254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/sockets/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ static void from_zval_write_control_array(const zval *arr, char *msghdr_c, ser_c
char *bufp = buf;
zval *elem;
uint32_t i = 0;
int num_elems;
uint32_t num_elems;
void *control_buf;
zend_llist_element *alloc;
size_t control_len,
Expand Down Expand Up @@ -1102,7 +1102,7 @@ static void from_zval_write_iov_array_aux(zval *elem, unsigned i, void **args, s
}
static void from_zval_write_iov_array(const zval *arr, char *msghdr_c, ser_context *ctx)
{
int num_elem;
uint32_t num_elem;
struct msghdr *msg = (struct msghdr*)msghdr_c;

if (Z_TYPE_P(arr) != IS_ARRAY) {
Expand Down Expand Up @@ -1361,7 +1361,7 @@ void to_zval_read_ucred(const char *data, zval *zv, res_context *ctx)
#ifdef SCM_RIGHTS
size_t calculate_scm_rights_space(const zval *arr, ser_context *ctx)
{
int num_elems;
uint32_t num_elems;

if (Z_TYPE_P(arr) != IS_ARRAY) {
do_from_zval_err(ctx, "%s", "expected an array here");
Expand All @@ -1374,7 +1374,7 @@ size_t calculate_scm_rights_space(const zval *arr, ser_context *ctx)
return (size_t)-1;
}

return zend_hash_num_elements(Z_ARRVAL_P(arr)) * sizeof(int);
return num_elems * sizeof(int);
}
static void from_zval_write_fd_array_aux(zval *elem, unsigned i, void **args, ser_context *ctx)
{
Expand Down Expand Up @@ -1420,7 +1420,7 @@ void from_zval_write_fd_array(const zval *arr, char *int_arr, ser_context *ctx)
void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
{
size_t *cmsg_len;
int num_elems,
uint32_t num_elems,
i;
struct cmsghdr *dummy_cmsg = 0;
size_t data_offset;
Expand Down