From: Michael Haggerty Date: Mon, 14 Apr 2014 13:54:51 GMT Subject: [PATCH v3 21/25] commit_lock_file(): use a strbuf to manage temporary space Message-ID: <1397483695-10888-22-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1397483695-10888-1-git-send-email-mhagger@alum.mit.edu> Avoid relying on the filename length restrictions that are currently checked by lock_file(). Signed-off-by: Michael Haggerty --- lockfile.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lockfile.c b/lockfile.c index fce53f1..0aa2998 100644 --- a/lockfile.c +++ b/lockfile.c @@ -305,7 +305,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; @@ -313,11 +314,12 @@ int commit_lock_file(struct lock_file *lk) if (!lk->active) die("BUG: attempt to commit unlocked object"); - 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->active = 0; lk->filename[0] = 0; -- 1.9.1