aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1046: the "secure" variable is used inconsistently

Browse Source 
Problem:    the "secure" variable is used inconsistently. (Justin M. Keyes)
Solution:   Set it to one instead of incrementing.
This commit is contained in:
Bram Moolenaar 2019-03-24 14:02:04 +01:00
parent 63dbfd33c1
commit 82b033eff8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.c
View File

@ -5498,7 +5498,7 @@ chk_modeline(
current_sctx.sc_lnum = 0; current_sctx.sc_lnum = 0;
#endif #endif
// Make sure no risky things are executed as a side effect. // Make sure no risky things are executed as a side effect.
++secure; secure = 1;
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);

9
src/option.c
View File

@ -5151,13 +5151,12 @@ do_set(
// effects in secure mode. Also when the value was // effects in secure mode. Also when the value was
// set with the P_INSECURE flag and is not // set with the P_INSECURE flag and is not
// completely replaced. // completely replaced.
if (secure if ((opt_flags & OPT_MODELINE)
#ifdef HAVE_SANDBOX #ifdef HAVE_SANDBOX
|| sandbox != 0 || sandbox != 0
#endif #endif
|| (opt_flags & OPT_MODELINE) || (!value_is_replaced && (*p & P_INSECURE)))
|| (!value_is_replaced && (*p & P_INSECURE))) secure = 1;
++secure;
// Handle side effects, and set the global value // Handle side effects, and set the global value
// for ":set" on local options. Note: when setting // for ":set" on local options. Note: when setting

2
src/version.c
View File

@ -775,6 +775,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 */
/**/
1046,
/**/ /**/
1045, 1045,
/**/ /**/