summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-09-24 21:06:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-25 17:18:18 (GMT)
commit330c8e26701c33f1d74dbe3c2692f29b5ed4ba5f (patch)
tree3eb1ae60ae92a3d2ed8f36216bb207847947ee23 /entry.c
parent19bdd3e7e160a0b000c15d8bf6d33f4149e3f911 (diff)
downloadgit-330c8e26701c33f1d74dbe3c2692f29b5ed4ba5f.zip
git-330c8e26701c33f1d74dbe3c2692f29b5ed4ba5f.tar.gz
git-330c8e26701c33f1d74dbe3c2692f29b5ed4ba5f.tar.bz2
entry.c: convert strcpy to xsnprintf
This particular conversion is non-obvious, because nobody has passed our function the length of the destination buffer. However, the interface to checkout_entry specifies that the buffer must be at least TEMPORARY_FILENAME_LENGTH bytes long, so we can check that (meaning the existing code was not buggy, but merely worrisome to somebody reading it). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/entry.c b/entry.c
index 1eda8e9..582c400 100644
--- a/entry.c
+++ b/entry.c
@@ -96,8 +96,8 @@ static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempf
{
int symlink = (ce->ce_mode & S_IFMT) != S_IFREG;
if (to_tempfile) {
- strcpy(path, symlink
- ? ".merge_link_XXXXXX" : ".merge_file_XXXXXX");
+ xsnprintf(path, TEMPORARY_FILENAME_LENGTH, "%s",
+ symlink ? ".merge_link_XXXXXX" : ".merge_file_XXXXXX");
return mkstemp(path);
} else {
return create_file(path, !symlink ? ce->ce_mode : 0666);