From 3e88e8fc085bbfad142d51a07ef918b9b5ca1d72 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 1 Oct 2014 12:28:31 +0200 Subject: commit_lock_file(): use a strbuf to manage temporary space Avoid relying on the filename length restrictions that are currently checked by lock_file(). Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano diff --git a/lockfile.c b/lockfile.c index 89043f5..1dd118f 100644 --- a/lockfile.c +++ b/lockfile.c @@ -319,7 +319,8 @@ int reopen_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->active) die("BUG: attempt to commit unlocked object"); @@ -327,11 +328,12 @@ int commit_lock_file(struct lock_file *lk) if (close_lock_file(lk)) return -1; - 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) { int save_errno = errno; rollback_lock_file(lk); errno = save_errno; -- cgit v0.10.2-6-g49f6