diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-04-09 19:59:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-16 17:56:47 -0700 |
| commit | 7861fa07c38d72a4fa6ae2e802553b8b0f3731d4 (patch) | |
| tree | a52060abdf17bfb822133067901c8c880139ed69 | |
| parent | 036465a248df7b0876e65d0e137826203305c606 (diff) | |
| download | git-ab/grep-plug-pathspec-leak.tar.gz | |
grep: plug a trivial memory leakab/grep-plug-pathspec-leak
Change the cleanup phase for the grep command to free the pathspec
struct that's allocated earlier in the same block, and used just a few
lines earlier.
With "grep hi README.md" valgrind reports a loss of 239 bytes now,
down from 351.
The relevant --num-callers=40 --leak-check=full --show-leak-kinds=all
backtrace is:
[...] 187 (112 direct, 75 indirect) bytes in 1 blocks are definitely lost in loss record 70 of 110
[...] at 0x4C2BBAF: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
[...] by 0x60B339: do_xmalloc (wrapper.c:59)
[...] by 0x60B2F6: xmalloc (wrapper.c:86)
[...] by 0x576B37: parse_pathspec (pathspec.c:652)
[...] by 0x4519F0: cmd_grep (grep.c:1215)
[...] by 0x4062EF: run_builtin (git.c:371)
[...] by 0x40544D: handle_builtin (git.c:572)
[...] by 0x4060A2: run_argv (git.c:624)
[...] by 0x4051C6: cmd_main (git.c:701)
[...] by 0x4C5901: main (common-main.c:43)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/grep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 9304c33e75..1b642b70e7 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1293,6 +1293,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) hit |= wait_all(); if (hit && show_in_pager) run_pager(&opt, prefix); + clear_pathspec(&pathspec); free_grep_patterns(&opt); return !hit; } |