Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
update-index: fix cache entry leak in add_one_file()
author
Jeff King
<peff@peff.net>
Tue, 5 Sep 2017 13:04:14 +0000
(09:04 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 6 Sep 2017 09:06:26 +0000
(18:06 +0900)
When we fail to add the cache entry to the index, we end up
just leaking the struct. We should follow the pattern of the
early-return above and free it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/update-index.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
fe6a01a
)
diff --git
a/builtin/update-index.c
b/builtin/update-index.c
index d562f2ec69c28f9cecf7da07e71374ae9aecad93..d955cd56b323387e2eb663225062d8f5bb439ee2 100644
(file)
--- a/
builtin/update-index.c
+++ b/
builtin/update-index.c
@@
-287,8
+287,10
@@
static int add_one_path(const struct cache_entry *old, const char *path, int len
}
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
- if (add_cache_entry(ce, option))
+ if (add_cache_entry(ce, option)) {
+ free(ce);
return error("%s: cannot add to the index - missing --add option?", path);
+ }
return 0;
}