[PATCH 2/2] read-cache.c: fix a memleak in add_to_index
From: Stefan Beller <hidden>
Date: 2016-06-15 23:04:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/2] read-cache.c: fix a memleak in add_to_index · Junio C Hamano <hidden>
Signed-off-by: Stefan Beller <redacted> --- I have reread your remarks from the weekend, and I agree this looks more intuitive. Thanks for pointing out the subtle details to make programming an art! read-cache.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index a102565..f837212 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -706,10 +706,14 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, !hashcmp(alias->sha1, ce->sha1) && ce->ce_mode == alias->ce_mode); - if (pretend) - ; - else if (add_index_entry(istate, ce, add_option)) - return error("unable to add %s to index",path); + if (!pretend) { + if (add_index_entry(istate, ce, add_option)) { + free(ce); + return error("unable to add %s to index",path); + } + } else { + free(ce); + } if (verbose && !was_same) printf("add '%s'\n", path); return 0;
--
2.3.0.81.gc37f363