[PATCH v2 21/25] commit_lock_file(): use a strbuf to manage temporary space
flat view
STALE3769d
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:00:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 6 in this series.
Revisions (6)
Avoid relying on the filename length restrictions that are currently checked by lock_file(). Signed-off-by: Michael Haggerty <redacted> --- lockfile.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index b955cca..bf018b5 100644
--- a/lockfile.c
+++ b/lockfile.c@@ -316,7 +316,8 @@ int close_lock_file(struct lock_file *lk) int commit_lock_file(struct lock_file *lk) { - char result_file[PATH_MAX]; + static struct strbuf result_file = STRBUF_INIT; + int err; if (lk->fd >= 0 && close_lock_file(lk)) return -1;
@@ -324,11 +325,12 @@ int commit_lock_file(struct lock_file *lk) if (!(lk->flags & LOCK_FLAGS_LOCKFILE_ACTIVE)) return 0; - strcpy(result_file, lk->filename); /* remove ".lock": */ - result_file[strlen(result_file) - LOCK_SUFFIX_LEN] = 0; - - if (rename(lk->filename, result_file)) + strbuf_add(&result_file, lk->filename, + strlen(lk->filename) - LOCK_SUFFIX_LEN); + err = rename(lk->filename, result_file.buf); + strbuf_reset(&result_file); + if (err) return -1; lk->flags &= ~LOCK_FLAGS_LOCKFILE_ACTIVE; lk->filename[0] = 0;
--
1.9.1