Mercurial > vim
changeset 12407:e9dbdc4d8279 v8.0.1083
patch 8.0.1083: leaking memory in input part of channel
commit https://github.com/vim/vim/commit/5b5adf5b9cd226d775643872e65c62674d6ada95
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 9 18:16:43 2017 +0200
patch 8.0.1083: leaking memory in input part of channel
Problem: Leaking memory in input part of channel.
Solution: Clear the input part of channel. Free the entry. Move failing
command test to a separate file to avoid bogus leak reports
clouding tests that should not leak.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 09 Sep 2017 18:30:05 +0200 |
| parents | 3448b3b3a56c |
| children | 587fc0ce700e |
| files | src/Makefile src/channel.c src/testdir/Make_all.mak src/testdir/test_terminal.vim src/testdir/test_terminal_fail.vim src/version.c |
| diffstat | 6 files changed, 27 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2265,6 +2265,7 @@ test_arglist \ test_taglist \ test_tcl \ test_terminal \ + test_terminal_fail \ test_textobjects \ test_timers \ test_true_false \
--- a/src/channel.c +++ b/src/channel.c @@ -2939,6 +2939,7 @@ remove_from_writeque(writeq_T *wq, write wq->wq_prev = NULL; else wq->wq_next->wq_prev = NULL; + vim_free(entry); } /* @@ -2990,7 +2991,7 @@ channel_clear(channel_T *channel) channel_clear_one(channel, PART_SOCK); channel_clear_one(channel, PART_OUT); channel_clear_one(channel, PART_ERR); - /* there is no callback or queue for PART_IN */ + channel_clear_one(channel, PART_IN); free_callback(channel->ch_callback, channel->ch_partial); channel->ch_callback = NULL; channel->ch_partial = NULL;
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -194,6 +194,7 @@ NEW_TESTS = test_arabic.res \ test_system.res \ test_tcl.res \ test_terminal.res \ + test_terminal_fail.res \ test_textobjects.res \ test_undo.res \ test_usercommands.res \
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -608,14 +608,6 @@ func Test_terminal_redir_file() endif if has('unix') - let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) - call term_wait(buf) - call WaitFor('len(readfile("Xfile")) > 0') - call assert_match('executing job failed', readfile('Xfile')[0]) - call WaitFor('!&modified') - call delete('Xfile') - bwipe - call writefile(['one line'], 'Xfile') let buf = term_start('cat', {'in_io': 'file', 'in_name': 'Xfile'}) call term_wait(buf)
new file mode 100644 --- /dev/null +++ b/src/testdir/test_terminal_fail.vim @@ -0,0 +1,21 @@ +" This test is in a separate file, because it usually causes reports for memory +" leaks under valgrind. That is because when fork/exec fails memory is not +" freed. Since the process exists right away it's not a real leak. + +if !has('terminal') + finish +endif + +source shared.vim + +func Test_terminal_redir_fails() + if has('unix') + let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) + call term_wait(buf) + call WaitFor('len(readfile("Xfile")) > 0') + call assert_match('executing job failed', readfile('Xfile')[0]) + call WaitFor('!&modified') + call delete('Xfile') + bwipe + endif +endfunc