aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-09 22:28:07 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-11 09:57:43 -0700
commit59efba64ac144a8838a35ae687b8c5bb6cd43363 (patch)
tree42f6c8fb3b0d2d55b2ff4e2363638f40fa8205d4
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff)
downloadgit-59efba64ac144a8838a35ae687b8c5bb6cd43363.tar.gz
git-59efba64ac144a8838a35ae687b8c5bb6cd43363.tar.xz
core: Stop leaking ondisk_cache_entrys
Noticed with valgrind. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--read-cache.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index f1f789b7b..1f42473e8 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1516,6 +1516,7 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
int size = ondisk_ce_size(ce);
struct ondisk_cache_entry *ondisk = xcalloc(1, size);
char *name;
+ int result;
ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
@@ -1539,7 +1540,9 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
name = ondisk->name;
memcpy(name, ce->name, ce_namelen(ce));
- return ce_write(c, fd, ondisk, size);
+ result = ce_write(c, fd, ondisk, size);
+ free(ondisk);
+ return result;
}
int write_index(struct index_state *istate, int newfd)