mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 08:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0613: when executing an insecure function the secure flag is stuck

Browse Source 
Problem:    When executing an insecure function the secure flag is stuck.
            (Gabriel Barta)
Solution:   Restore "secure" instead of decrementing it. (closes vim/vim#3705)
48f377a476
This commit is contained in:
Jan Edmund Lazo
2019-05-05 11:23:25 -04:00
parent 0673b0d251
commit 9c6476d81e
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/buffer.c
View File

@@ -5112,6 +5112,7 @@ chk_modeline(
*e = NUL; // truncate the set command *e = NUL; // truncate the set command
if (*s != NUL) { // skip over an empty "::" if (*s != NUL) { // skip over an empty "::"
const int secure_save = secure;
save_SID = current_SID; save_SID = current_SID;
current_SID = SID_MODELINE; current_SID = SID_MODELINE;
// Make sure no risky things are executed as a side effect. // Make sure no risky things are executed as a side effect.
@@ -5119,7 +5120,7 @@ chk_modeline(
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
secure--; secure = secure_save;
current_SID = save_SID; current_SID = save_SID;
if (retval == FAIL) { // stop if error found if (retval == FAIL) { // stop if error found
break; break;

19
src/nvim/option.c
View File

@@ -1833,7 +1833,7 @@ int do_set(
{ {
uint32_t *p = insecure_flag(opt_idx, opt_flags); uint32_t *p = insecure_flag(opt_idx, opt_flags);
int did_inc_secure = false; const int secure_saved = secure;
// When an option is set in the sandbox, from a // When an option is set in the sandbox, from a
// modeline or in secure mode, then deal with side // modeline or in secure mode, then deal with side
@@ -1844,23 +1844,20 @@ int do_set(
|| sandbox != 0 || sandbox != 0
|| (opt_flags & OPT_MODELINE) || (opt_flags & OPT_MODELINE)
|| (!value_is_replaced && (*p & P_INSECURE))) { || (!value_is_replaced && (*p & P_INSECURE))) {
did_inc_secure = true; secure++;
secure++;
} }
// Handle side effects, and set the global value for // Handle side effects, and set the global value
// ":set" on local options. Note: when setting 'syntax' // for ":set" on local options. Note: when setting
// or 'filetype' autocommands may be triggered that can // 'syntax' or 'filetype' autocommands may be
// cause havoc. // triggered that can cause havoc.
errmsg = did_set_string_option(opt_idx, (char_u **)varp, errmsg = did_set_string_option(opt_idx, (char_u **)varp,
new_value_alloced, oldval, new_value_alloced, oldval,
errbuf, sizeof(errbuf), errbuf, sizeof(errbuf),
opt_flags, &value_checked); opt_flags, &value_checked);
if (did_inc_secure) { secure = secure_saved;
secure--; }
}
}
if (errmsg == NULL) { if (errmsg == NULL) {
if (!starting) { if (!starting) {

23
src/nvim/testdir/test_autocmd.vim
View File

@@ -677,6 +677,29 @@ func Test_OptionSet_diffmode_close()
"delfunc! AutoCommandOptionSet "delfunc! AutoCommandOptionSet
endfunc endfunc
func Test_OptionSet_modeline()
throw 'skipped: Nvim does not support test_override()'
call test_override('starting', 1)
au! OptionSet
augroup set_tabstop
au OptionSet tabstop call timer_start(1, {-> execute("echo 'Handler called'", "")})
augroup END
call writefile(['vim: set ts=7 sw=5 :', 'something'], 'XoptionsetModeline')
set modeline
let v:errmsg = ''
call assert_fails('split XoptionsetModeline', 'E12:')
call assert_equal(7, &ts)
call assert_equal('', v:errmsg)
augroup set_tabstop
au!
augroup END
bwipe!
set ts&
call delete('XoptionsetModeline')
call test_override('starting', 0)
endfunc
" Test for Bufleave autocommand that deletes the buffer we are about to edit. " Test for Bufleave autocommand that deletes the buffer we are about to edit.
func Test_BufleaveWithDelete() func Test_BufleaveWithDelete()
new | edit Xfile1 new | edit Xfile1