If rename() fails, call rollback_lock_file() to delete the lock file
(in case it is still present) and reset the filename field to the
empty string so that the lockfile object is left in a valid state.
Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
---
lockfile.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index becb3da..6ae5c84 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -311,25 +311,29 @@ int reopen_lock_file(struct lock_file *lk)
int commit_lock_file(struct lock_file *lk)
{
char result_file[PATH_MAX];
+ int save_errno;
if (!lk->filename[0])
die("BUG: attempt to commit unlocked object");
- if (lk->fd >= 0 && close_lock_file(lk)) {
- int save_errno = errno;
- rollback_lock_file(lk);
- errno = save_errno;
- return -1;
- }
+ 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))
- return -1;
+ goto rollback;
+
lk->filename[0] = 0;
return 0;
+
+rollback:
+ save_errno = errno;
+ rollback_lock_file(lk);
+ errno = save_errno;
+ return -1;
}
int hold_locked_index(struct lock_file *lk, int die_on_error)
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html