kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

revert: fix tiny memory leak in cherry-pick --ff 

We forgot to free defmsg when returning early for a fast-forward.

Fixing this should reduce noise during test suite runs with valgrind.
More importantly, once cherry-pick learns to pick multiple commits,
the amount of memory leaked would start to add up.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder 2010-03-20 21:01:20 -05:00 committed by Junio C Hamano
parent 8e75abfd8d
commit 28db756fee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-revert.c
View File

@ -274,7 +274,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
int i, index_fd, clean; int i, index_fd, clean;
char *oneline, *reencoded_message = NULL; char *oneline, *reencoded_message = NULL;
const char *message, *encoding; const char *message, *encoding;
char *defmsg = git_pathdup("MERGE_MSG"); char *defmsg = NULL;
struct merge_options o; struct merge_options o;
struct tree *result, *next_tree, *base_tree, *head_tree; struct tree *result, *next_tree, *base_tree, *head_tree;
static struct lock_file index_lock; static struct lock_file index_lock;
@ -364,6 +364,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
* reverse of it if we are revert. * reverse of it if we are revert.
*/ */


defmsg = git_pathdup("MERGE_MSG");
msg_fd = hold_lock_file_for_update(&msg_file, defmsg, msg_fd = hold_lock_file_for_update(&msg_file, defmsg,
LOCK_DIE_ON_ERROR); LOCK_DIE_ON_ERROR);