diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-06-10 20:43:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-11 13:51:27 -0700 |
| commit | 0e71bc300432b9e63bdbc8e28b0c5c0fafb601fc (patch) | |
| tree | b4afbd74f664c8b1400ec85d45abd079da401399 | |
| parent | da3efdb17bef25dedc753131462ee784d822132e (diff) | |
| download | git-0e71bc300432b9e63bdbc8e28b0c5c0fafb601fc.tar.gz | |
check_aliased_update: strcpy() instead of strcat() to copy
da3efdb (receive-pack: detect aliased updates which can occur with
symrefs, 2010-04-19) introduced two strcat() into uninitialized
strings. The intent was clearly make a copy of the static buffer used
by find_unique_abbrev(), so use strcpy() instead.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Tested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-receive-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index bb34757d27..7e4129ddc8 100644 --- a/builtin-receive-pack.c +++ b/builtin-receive-pack.c @@ -515,9 +515,9 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) dst_cmd->skip_update = 1; strcpy(cmd_oldh, find_unique_abbrev(cmd->old_sha1, DEFAULT_ABBREV)); - strcat(cmd_newh, find_unique_abbrev(cmd->new_sha1, DEFAULT_ABBREV)); + strcpy(cmd_newh, find_unique_abbrev(cmd->new_sha1, DEFAULT_ABBREV)); strcpy(dst_oldh, find_unique_abbrev(dst_cmd->old_sha1, DEFAULT_ABBREV)); - strcat(dst_newh, find_unique_abbrev(dst_cmd->new_sha1, DEFAULT_ABBREV)); + strcpy(dst_newh, find_unique_abbrev(dst_cmd->new_sha1, DEFAULT_ABBREV)); rp_error("refusing inconsistent update between symref '%s' (%s..%s) and" " its target '%s' (%s..%s)", cmd->ref_name, cmd_oldh, cmd_newh, |