mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
checkout: fix memory leak
This change addresses part of the NEEDSWORK comment above the code, therefore the comment needs to be adjusted, too. Discovered via Coverity. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
05c2b7ba49
commit
514e803944
|
@ -235,14 +235,14 @@ static int checkout_merged(int pos, const struct checkout *state)
|
|||
/*
|
||||
* NEEDSWORK:
|
||||
* There is absolutely no reason to write this as a blob object
|
||||
* and create a phony cache entry just to leak. This hack is
|
||||
* primarily to get to the write_entry() machinery that massages
|
||||
* the contents to work-tree format and writes out which only
|
||||
* allows it for a cache entry. The code in write_entry() needs
|
||||
* to be refactored to allow us to feed a <buffer, size, mode>
|
||||
* instead of a cache entry. Such a refactoring would help
|
||||
* merge_recursive as well (it also writes the merge result to the
|
||||
* object database even when it may contain conflicts).
|
||||
* and create a phony cache entry. This hack is primarily to get
|
||||
* to the write_entry() machinery that massages the contents to
|
||||
* work-tree format and writes out which only allows it for a
|
||||
* cache entry. The code in write_entry() needs to be refactored
|
||||
* to allow us to feed a <buffer, size, mode> instead of a cache
|
||||
* entry. Such a refactoring would help merge_recursive as well
|
||||
* (it also writes the merge result to the object database even
|
||||
* when it may contain conflicts).
|
||||
*/
|
||||
if (write_sha1_file(result_buf.ptr, result_buf.size,
|
||||
blob_type, oid.hash))
|
||||
|
@ -251,6 +251,7 @@ static int checkout_merged(int pos, const struct checkout *state)
|
|||
if (!ce)
|
||||
die(_("make_cache_entry failed for path '%s'"), path);
|
||||
status = checkout_entry(ce, state, NULL);
|
||||
free(ce);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue