Skip to content

Commit 4a0ad9b

Browse files
authored
ext/sockets: cmsg data array elements using uint32_t type instead. (#19254)
1 parent 63e40b1 commit 4a0ad9b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ext/sockets/conversions.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ static void from_zval_write_control_array(const zval *arr, char *msghdr_c, ser_c
930930
char *bufp = buf;
931931
zval *elem;
932932
uint32_t i = 0;
933-
int num_elems;
933+
uint32_t num_elems;
934934
void *control_buf;
935935
zend_llist_element *alloc;
936936
size_t control_len,
@@ -1102,7 +1102,7 @@ static void from_zval_write_iov_array_aux(zval *elem, unsigned i, void **args, s
11021102
}
11031103
static void from_zval_write_iov_array(const zval *arr, char *msghdr_c, ser_context *ctx)
11041104
{
1105-
int num_elem;
1105+
uint32_t num_elem;
11061106
struct msghdr *msg = (struct msghdr*)msghdr_c;
11071107

11081108
if (Z_TYPE_P(arr) != IS_ARRAY) {
@@ -1361,7 +1361,7 @@ void to_zval_read_ucred(const char *data, zval *zv, res_context *ctx)
13611361
#ifdef SCM_RIGHTS
13621362
size_t calculate_scm_rights_space(const zval *arr, ser_context *ctx)
13631363
{
1364-
int num_elems;
1364+
uint32_t num_elems;
13651365

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

1377-
return zend_hash_num_elements(Z_ARRVAL_P(arr)) * sizeof(int);
1377+
return num_elems * sizeof(int);
13781378
}
13791379
static void from_zval_write_fd_array_aux(zval *elem, unsigned i, void **args, ser_context *ctx)
13801380
{
@@ -1420,7 +1420,7 @@ void from_zval_write_fd_array(const zval *arr, char *int_arr, ser_context *ctx)
14201420
void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
14211421
{
14221422
size_t *cmsg_len;
1423-
int num_elems,
1423+
uint32_t num_elems,
14241424
i;
14251425
struct cmsghdr *dummy_cmsg = 0;
14261426
size_t data_offset;

0 commit comments

Comments
 (0)