Avoid relying on the filename length restrictions that are currently
checked by lock_file().
Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
lockfile.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
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;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
