mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compat/regex: fix argument order to calloc(3)

Browse Source 
Windows compiler suddenly started complaining that calloc(3) takes
its arguments in <nmemb, size> order.  Indeed, there are many calls
that has their arguments in a _wrong_ order.

Fix them all.

A sample breakage can be seen at

  https://github.com/git/git/actions/runs/9046793153/job/24857988702#step:4:272

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2024-05-11 23:25:04 -07:00
parent 668f2d5361
commit f01301aabe
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compat/regex/regcomp.c
View File

@ -868,7 +868,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
if (table_size > pat_len) if (table_size > pat_len)
break; break;
dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size); dfa->state_table = calloc (table_size, sizeof (struct re_state_table_entry));
dfa->state_hash_mask = table_size - 1; dfa->state_hash_mask = table_size - 1;
dfa->mb_cur_max = MB_CUR_MAX; dfa->mb_cur_max = MB_CUR_MAX;
@ -936,7 +936,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
{ {
int i, j, ch; int i, j, ch;
dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); dfa->sb_char = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
if (BE (dfa->sb_char == NULL, 0)) if (BE (dfa->sb_char == NULL, 0))
return REG_ESPACE; return REG_ESPACE;
@ -3079,9 +3079,9 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
_NL_COLLATE_SYMB_EXTRAMB); _NL_COLLATE_SYMB_EXTRAMB);
} }
#endif #endif
sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); sbcset = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
#ifdef RE_ENABLE_I18N #ifdef RE_ENABLE_I18N
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); mbcset = (re_charset_t *) calloc (1, sizeof (re_charset_t));
#endif /* RE_ENABLE_I18N */ #endif /* RE_ENABLE_I18N */
#ifdef RE_ENABLE_I18N #ifdef RE_ENABLE_I18N
if (BE (sbcset == NULL || mbcset == NULL, 0)) if (BE (sbcset == NULL || mbcset == NULL, 0))
@ -3626,9 +3626,9 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
re_token_t br_token; re_token_t br_token;
bin_tree_t *tree; bin_tree_t *tree;
sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); sbcset = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
#ifdef RE_ENABLE_I18N #ifdef RE_ENABLE_I18N
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); mbcset = (re_charset_t *) calloc (1, sizeof (re_charset_t));
#endif /* RE_ENABLE_I18N */ #endif /* RE_ENABLE_I18N */
#ifdef RE_ENABLE_I18N #ifdef RE_ENABLE_I18N

4
compat/regex/regex_internal.c
View File

@ -1628,7 +1628,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
reg_errcode_t err; reg_errcode_t err;
re_dfastate_t *newstate; re_dfastate_t *newstate;
newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t));
if (BE (newstate == NULL, 0)) if (BE (newstate == NULL, 0))
return NULL; return NULL;
err = re_node_set_init_copy (&newstate->nodes, nodes); err = re_node_set_init_copy (&newstate->nodes, nodes);
@ -1678,7 +1678,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
reg_errcode_t err; reg_errcode_t err;
re_dfastate_t *newstate; re_dfastate_t *newstate;
newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t));
if (BE (newstate == NULL, 0)) if (BE (newstate == NULL, 0))
return NULL; return NULL;
err = re_node_set_init_copy (&newstate->nodes, nodes); err = re_node_set_init_copy (&newstate->nodes, nodes);

10
compat/regex/regexec.c
View File

@ -2796,8 +2796,8 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx)
continue; /* No. */ continue; /* No. */
if (sub_top->path == NULL) if (sub_top->path == NULL)
{ {
sub_top->path = calloc (sizeof (state_array_t), sub_top->path = calloc (sl_str - sub_top->str_idx + 1,
sl_str - sub_top->str_idx + 1); sizeof (state_array_t));
if (sub_top->path == NULL) if (sub_top->path == NULL)
return REG_ESPACE; return REG_ESPACE;
} }
@ -3361,7 +3361,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
if (ndests == 0) if (ndests == 0)
{ {
state->trtable = (re_dfastate_t **) state->trtable = (re_dfastate_t **)
calloc (sizeof (re_dfastate_t *), SBC_MAX); calloc (SBC_MAX, sizeof (re_dfastate_t *));
return 1; return 1;
} }
return 0; return 0;
@ -3457,7 +3457,7 @@ out_free:
discern by looking at the character code: allocate a discern by looking at the character code: allocate a
256-entry transition table. */ 256-entry transition table. */
trtable = state->trtable = trtable = state->trtable =
(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX); (re_dfastate_t **) calloc (SBC_MAX, sizeof (re_dfastate_t *));
if (BE (trtable == NULL, 0)) if (BE (trtable == NULL, 0))
goto out_free; goto out_free;
@ -3488,7 +3488,7 @@ out_free:
transition tables, one starting at trtable[0] and one transition tables, one starting at trtable[0] and one
starting at trtable[SBC_MAX]. */ starting at trtable[SBC_MAX]. */
trtable = state->word_trtable = trtable = state->word_trtable =
(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX); (re_dfastate_t **) calloc (2 * SBC_MAX, sizeof (re_dfastate_t *));
if (BE (trtable == NULL, 0)) if (BE (trtable == NULL, 0))
goto out_free; goto out_free;