diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
commit | 743fba85f7dfb04eff4df55dc8d7aa08f3f8eaa3 (patch) | |
tree | e2aa879bce2c875e7268fb35b50d0287ed505fd3 | |
parent | a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d (diff) | |
parent | deb9c1575c456b9d12ff05fdd2bec516dfb34ae4 (diff) | |
download | git-743fba85f7dfb04eff4df55dc8d7aa08f3f8eaa3.tar.gz |
Merge branch 'rs/notes-merge-no-toctou' into maint
"git notes merge" had a code to see if a path exists (and fails if
it does) and then open the path for writing (when it doesn't).
Replace it with open with O_EXCL.
* rs/notes-merge-no-toctou:
notes-merge: use O_EXCL to avoid overwriting existing files
-rw-r--r-- | notes-merge.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/notes-merge.c b/notes-merge.c index 34bfac0c68..f00059520e 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -298,12 +298,8 @@ static void write_buf_to_worktree(const unsigned char *obj, char *path = git_pathdup(NOTES_MERGE_WORKTREE "/%s", sha1_to_hex(obj)); if (safe_create_leading_directories_const(path)) die_errno("unable to create directory for '%s'", path); - if (file_exists(path)) - die("found existing file at '%s'", path); - fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0666); - if (fd < 0) - die_errno("failed to open '%s'", path); + fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666); while (size > 0) { long ret = write_in_full(fd, buf, size); |