* [PATCH] rerere: plug memory leaks upon "rerere forget" failure
@ 2016-05-11 23:32 Junio C Hamano
2016-05-19 19:43 ` Johannes Sixt
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2016-05-11 23:32 UTC (permalink / raw
To: git
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
rerere.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/rerere.c b/rerere.c
index 1693866..a804171 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1052,8 +1052,8 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
handle_cache(path, sha1, rerere_path(id, "thisimage"));
if (read_mmfile(&cur, rerere_path(id, "thisimage"))) {
free(cur.ptr);
- return error("Failed to update conflicted state in '%s'",
- path);
+ error("Failed to update conflicted state in '%s'", path);
+ goto fail_exit;
}
cleanly_resolved = !try_merge(id, path, &cur, &result);
free(result.ptr);
@@ -1062,14 +1062,19 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
break;
}
- if (id->collection->status_nr <= id->variant)
- return error("no remembered resolution for '%s'", path);
+ if (id->collection->status_nr <= id->variant) {
+ error("no remembered resolution for '%s'", path);
+ goto fail_exit;
+ }
filename = rerere_path(id, "postimage");
- if (unlink(filename))
- return (errno == ENOENT
- ? error("no remembered resolution for %s", path)
- : error("cannot unlink %s: %s", filename, strerror(errno)));
+ if (unlink(filename)) {
+ if (errno == ENOENT)
+ error("no remembered resolution for %s", path);
+ else
+ error("cannot unlink %s: %s", filename, strerror(errno));
+ goto fail_exit;
+ };
/*
* Update the preimage so that the user can resolve the
@@ -1088,6 +1093,10 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
item->util = id;
fprintf(stderr, "Forgot resolution for %s\n", path);
return 0;
+
+fail_exit:
+ free(id);
+ return -1;
}
int rerere_forget(struct pathspec *pathspec)
--
2.8.2-679-g91c6421
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rerere: plug memory leaks upon "rerere forget" failure
2016-05-11 23:32 [PATCH] rerere: plug memory leaks upon "rerere forget" failure Junio C Hamano
@ 2016-05-19 19:43 ` Johannes Sixt
2016-05-19 20:05 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Sixt @ 2016-05-19 19:43 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
Am 12.05.2016 um 01:32 schrieb Junio C Hamano:
> + if (unlink(filename)) {
> + if (errno == ENOENT)
> + error("no remembered resolution for %s", path);
> + else
> + error("cannot unlink %s: %s", filename, strerror(errno));
> + goto fail_exit;
> + };
If you haven't merged this topic yet, you might want to remove this
superfluous empty statement.
-- Hannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rerere: plug memory leaks upon "rerere forget" failure
2016-05-19 19:43 ` Johannes Sixt
@ 2016-05-19 20:05 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2016-05-19 20:05 UTC (permalink / raw
To: Johannes Sixt; +Cc: git
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-19 20:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-11 23:32 [PATCH] rerere: plug memory leaks upon "rerere forget" failure Junio C Hamano
2016-05-19 19:43 ` Johannes Sixt
2016-05-19 20:05 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).