aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.0476: memory leaks in test_escaped_glob

Browse Source 
Problem:    Memory leaks in test_escaped_glob.
Solution:   Avoid failure when running the shell, use the sandbox.
This commit is contained in:
Bram Moolenaar
2018-10-14 22:03:56 +02:00
parent 27e80c885b
commit a2aad02830
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/testdir/test_escaped_glob.vim
View File

@@ -2,8 +2,6 @@
" characters. " characters.
function SetUp() function SetUp()
" make sure glob() doesn't use the shell
set shell=doesnotexist
" consistent sorting of file names " consistent sorting of file names
set nofileignorecase set nofileignorecase
endfunction endfunction
@@ -14,19 +12,22 @@ function Test_glob()
" filenames. Disable the test on non-Unix systems for now. " filenames. Disable the test on non-Unix systems for now.
return return
endif endif
call assert_equal("", glob('Xxx\{'))
call assert_equal("", glob('Xxx\$')) " Execute these commands in the sandbox, so that using the shell fails.
" Setting 'shell' to an invalid name causes a memory leak.
sandbox call assert_equal("", glob('Xxx\{'))
sandbox call assert_equal("", glob('Xxx\$'))
w! Xxx{ w! Xxx{
w! Xxx\$ w! Xxx\$
call assert_equal("Xxx{", glob('Xxx\{')) sandbox call assert_equal("Xxx{", glob('Xxx\{'))
call assert_equal("Xxx$", glob('Xxx\$')) sandbox call assert_equal("Xxx$", glob('Xxx\$'))
call delete('Xxx{') call delete('Xxx{')
call delete('Xxx$') call delete('Xxx$')
endfunction endfunction
function Test_globpath() function Test_globpath()
call assert_equal("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim", sandbox call assert_equal("sautest/autoload/globone.vim\nsautest/autoload/globtwo.vim",
\ globpath('sautest/autoload', 'glob*.vim')) \ globpath('sautest/autoload', 'glob*.vim'))
call assert_equal(['sautest/autoload/globone.vim', 'sautest/autoload/globtwo.vim'], sandbox call assert_equal(['sautest/autoload/globone.vim', 'sautest/autoload/globtwo.vim'],
\ globpath('sautest/autoload', 'glob*.vim', 0, 1)) \ globpath('sautest/autoload', 'glob*.vim', 0, 1))
endfunction endfunction

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
476,
/**/ /**/
475, 475,
/**/ /**/