diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-06 08:58:18 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-04-06 08:58:47 -0400 |
| commit | 071f2da66bacfd5a2d4ab87bda275d3848ddcc0e (patch) | |
| tree | 902dcc39a81a75dc8dba844e83f4081657dd8c0a /src | |
| parent | 9edbeec07716cff5607202dbd20b81917416030f (diff) | |
| download | rneovim-071f2da66bacfd5a2d4ab87bda275d3848ddcc0e.tar.gz rneovim-071f2da66bacfd5a2d4ab87bda275d3848ddcc0e.tar.bz2 rneovim-071f2da66bacfd5a2d4ab87bda275d3848ddcc0e.zip | |
vim-patch:7.4.2359
Problem: Memory leak in timer_start().
Solution: Check the right field to be NULL.
https://github.com/vim/vim/commit/26fe0d56912e42c2b16a61b2480e19ba569aee98
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index 2a768585ce..fd2b50b495 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -48,12 +48,12 @@ endfunc func Test_with_partial_callback() let g:val = 0 - let s:meow = {} - function s:meow.bite(...) - let g:val += 1 + let meow = {'one': 1} + function meow.bite(...) + let g:val += self.one endfunction - call timer_start(50, s:meow.bite) + call timer_start(50, meow.bite) let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') diff --git a/src/nvim/version.c b/src/nvim/version.c index d16eab7201..9a5d7ce169 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -82,7 +82,7 @@ static const int included_patches[] = { 2362, // 2361 NA // 2360, - // 2359 NA + 2359, // 2358 NA 2357, // 2356, |