Skip to content

Fix gcc-14 Wcalloc-transposed-args warnings #13818

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

Closed
wants to merge 2 commits into from
Closed

Fix gcc-14 Wcalloc-transposed-args warnings #13818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853ed08
Fix gcc-14 Wcalloc-transposed-args warnings
crrodriguez Mar 27, 2024
9977284
Merge branch 'php:master' into calloc-transposed-args
crrodriguez Apr 1, 2024
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
4 changes: 2 additions & 2 deletions ext/ffi/ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2159,7 +2159,7 @@ static zend_result zend_ffi_cdata_get_closure(zend_object *obj, zend_class_entry
if (EXPECTED(EG(trampoline).common.function_name == NULL)) {
func = &EG(trampoline);
} else {
func = ecalloc(sizeof(zend_internal_function), 1);
func = ecalloc(1, sizeof(zend_internal_function));
}
func->type = ZEND_INTERNAL_FUNCTION;
func->common.arg_flags[0] = 0;
Expand Down Expand Up @@ -2912,7 +2912,7 @@ static zend_function *zend_ffi_get_func(zend_object **obj, zend_string *name, co
if (EXPECTED(EG(trampoline).common.function_name == NULL)) {
func = &EG(trampoline);
} else {
func = ecalloc(sizeof(zend_internal_function), 1);
func = ecalloc(1, sizeof(zend_internal_function));
}
func->common.type = ZEND_INTERNAL_FUNCTION;
func->common.arg_flags[0] = 0;
Expand Down
2 changes: 1 addition & 1 deletion ext/opcache/zend_accelerator_blacklist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void zend_accel_blacklist_init(zend_blacklist *blacklist)
zend_accel_blacklist_shutdown(blacklist);
}

blacklist->entries = (zend_blacklist_entry *) calloc(sizeof(zend_blacklist_entry), blacklist->size);
blacklist->entries = (zend_blacklist_entry *) calloc(blacklist->size, sizeof(zend_blacklist_entry));
if (!blacklist->entries) {
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Blacklist initialization: no memory\n");
return;
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/proc_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ static zend_string* get_command_from_array(HashTable *array, char ***argv, int n
static descriptorspec_item* alloc_descriptor_array(HashTable *descriptorspec)
{
uint32_t ndescriptors = zend_hash_num_elements(descriptorspec);
return ecalloc(sizeof(descriptorspec_item), ndescriptors);
return ecalloc(ndescriptors, sizeof(descriptorspec_item));
}

static zend_string* get_string_parameter(zval *array, int index, char *param_name)
Expand Down
2 changes: 1 addition & 1 deletion main/streams/glob_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha
}
}

pglob = ecalloc(sizeof(*pglob), 1);
pglob = ecalloc(1, sizeof(*pglob));

if (0 != (ret = glob(path, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) {
#ifdef GLOB_NOMATCH
Expand Down