mirror of
https://github.com/git/git.git
synced 2024-11-23 09:56:28 +08:00
builtin/stash: fix leaking pathspec_from_file
The `OPT_PATHSPEC_FROM_FILE()` option maps to `OPT_FILENAME()`, which we know will always allocate memory when passed. We never free the memory though, causing a memory leak. Plug it. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5cca114973
commit
64fe1e4a8c
@ -1759,7 +1759,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
|
||||
int quiet = 0;
|
||||
int pathspec_file_nul = 0;
|
||||
const char *stash_msg = NULL;
|
||||
const char *pathspec_from_file = NULL;
|
||||
char *pathspec_from_file = NULL;
|
||||
struct pathspec ps;
|
||||
struct option options[] = {
|
||||
OPT_BOOL('k', "keep-index", &keep_index,
|
||||
@ -1821,7 +1821,9 @@ static int push_stash(int argc, const char **argv, const char *prefix,
|
||||
|
||||
ret = do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
|
||||
include_untracked, only_staged);
|
||||
|
||||
clear_pathspec(&ps);
|
||||
free(pathspec_from_file);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
test_description='stash --pathspec-from-file'
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
test_tick
|
||||
|
Loading…
Reference in New Issue
Block a user