From a2aad028305c306ecf33e0fd720fe1ed98596371 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 14 Oct 2018 22:03:56 +0200 Subject: patch 8.1.0476: memory leaks in test_escaped_glob Problem: Memory leaks in test_escaped_glob. Solution: Avoid failure when running the shell, use the sandbox. --- src/testdir/test_escaped_glob.vim | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/testdir/test_escaped_glob.vim') diff --git a/src/testdir/test_escaped_glob.vim b/src/testdir/test_escaped_glob.vim index e0723da6f..880f32eca 100644 --- a/src/testdir/test_escaped_glob.vim +++ b/src/testdir/test_escaped_glob.vim @@ -2,8 +2,6 @@ " characters. function SetUp() - " make sure glob() doesn't use the shell - set shell=doesnotexist " consistent sorting of file names set nofileignorecase endfunction @@ -14,19 +12,22 @@ function Test_glob() " filenames. Disable the test on non-Unix systems for now. return 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\$ - call assert_equal("Xxx{", glob('Xxx\{')) - call assert_equal("Xxx$", glob('Xxx\$')) + sandbox call assert_equal("Xxx{", glob('Xxx\{')) + sandbox call assert_equal("Xxx$", glob('Xxx\$')) call delete('Xxx{') call delete('Xxx$') endfunction 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')) - 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)) endfunction -- cgit v1.2.1