[PATCH v5 20/27] sequencer: roll back lock file if write_message() failed
From: Johannes Schindelin <hidden>
Date: 2016-10-21 12:26:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
There is no need to wait until the atexit() handler kicks in at the end. Signed-off-by: Johannes Schindelin <redacted> --- sequencer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 745c86f..9fced42 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -241,10 +241,14 @@ static int write_message(struct strbuf *msgbuf, const char *filename) int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0); if (msg_fd < 0) return error_errno(_("Could not lock '%s'"), filename); - if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0) - return error_errno(_("Could not write to %s"), filename); - if (commit_lock_file(&msg_file) < 0) + if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0) { + rollback_lock_file(&msg_file); + return error_errno(_("Could not write to '%s'"), filename); + } + if (commit_lock_file(&msg_file) < 0) { + rollback_lock_file(&msg_file); return error(_("Error wrapping up %s."), filename); + } return 0; }
--
2.10.1.583.g721a9e0