git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
Use the macro COPY_ARRAY to copy array elements and MOVE_ARRAY to do the same for moving them backwards in an array with potential overlap. The result is shorter and safer, as it infers the element type automatically and does a (very) basic type compatibility check for its first two arguments. These cases were missed by Coccinelle and contrib/coccinelle/array.cocci because the type of the elements is "const char *", not "char *", and the rules in the semantic patch cautiously insist on the sizeof operator being used on exactly the same type to avoid generating transformations that introduce subtle bugs into tricky code. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Sep 19, 2019 at 22:48 UTC
7bd97d6dff3b09600465b818163a413115dad217
1 file changed
+2
-3
git.c
+2
-3
@@ -369,8 +369,7 @@ static int handle_alias(int *argcp, const char ***argv)
369
die(_("alias '%s' changes environment variables.\n"
370
"You can use '!git' in the alias to do this"),
371
alias_command);
372
- memmove(new_argv - option_count, new_argv,
373
- count * sizeof(char *));
372
+ MOVE_ARRAY(new_argv - option_count, new_argv, count);
373
new_argv -= option_count;
374
375
if (count < 1)
@@ -385,7 +384,7 @@ static int handle_alias(int *argcp, const char ***argv)
384
385
REALLOC_ARRAY(new_argv, count + *argcp);
386
/* insert after command name */
388
- memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
387
+ COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
388
389
trace2_cmd_alias(alias_command, new_argv);
390
trace2_cmd_list_config();