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 | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index a09b4a3..59c822d 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -325,8 +325,9 @@ 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 save_errno;
+ int err;
if (!lk->active)
die("BUG: attempt to commit unlocked object");
@@ -334,13 +335,13 @@ int commit_lock_file(struct lock_file *lk)
if (lk->fd >= 0 && close_lock_file(lk))
goto rollback;
- 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)
goto rollback;
-
lk->active = 0;
lk->filename[0] = 0;
return 0;
--
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
