[PATCH] Fix handle leak in write_tree
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- Apr 25, 2007, 22:28 UTC
- Message-ID
- <20070425222817.GI30061@steel.home>
- In-Reply-To
- <20070423194925.GA5163@steel.home>
This is a quick and dirty fix for the broken "git cherry-pick -n" on some broken OS, which does not remove the directory entry after unlink succeeded(!) if the file is still open somewher. The entry is left but "protected": no open, no unlink, no stat. Very annoying.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- Alex Riesen, Mon, Apr 23, 2007 21:49:25 +0200:
Show 12 quoted lines
> diff --git a/builtin-write-tree.c b/builtin-write-tree.c
> index c88bbd1..d8284b4 100644
> --- a/builtin-write-tree.c
> +++ b/builtin-write-tree.c
> @@ -29,6 +29,7 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
>
> was_valid = cache_tree_fully_valid(active_cache_tree);
>
> + close(newfd);
> if (!was_valid) {
> if (cache_tree_update(active_cache_tree,
> active_cache, active_nr,BTW, can someone explain this hunk? And how does it manage to pass the tests?! And HOW did it manage to pass me?!!!
builtin-write-tree.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/builtin-write-tree.c b/builtin-write-tree.c index c88bbd1..391de53 100644 --- a/builtin-write-tree.c +++ b/builtin-write-tree.c @@ -36,8 +36,10 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) die("git-write-tree: error building trees"); if (0 <= newfd) { if (!write_cache(newfd, active_cache, active_nr) - && !close(newfd)) + && !close(newfd)) { commit_lock_file(lock_file); + newfd = -1; + } } /* Not being able to write is fine -- we are only interested * in updating the cache-tree part, and if the next caller @@ -55,6 +57,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix) else hashcpy(sha1, active_cache_tree->sha1); + if (0 <= newfd) + close(newfd); rollback_lock_file(lock_file); return 0;
-- 1.5.2.rc0.65.gd296e