vim-patch:8.1.1046: the "secure" variable is used inconsistently

Problem:    the "secure" variable is used inconsistently. (Justin M. Keyes)
Solution:   Set it to one instead of incrementing.
82b033eff8
This commit is contained in:
Jan Edmund Lazo
2019-05-05 11:38:34 -04:00
committed by James McCoy
parent 9dca0b27df
commit ad8bba10c4
2 changed files with 3 additions and 4 deletions

View File

@@ -4928,7 +4928,7 @@ chk_modeline (
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.
++secure; secure = 1;
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);

View File

@@ -1796,11 +1796,10 @@ 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)
|| sandbox != 0 || sandbox != 0
|| (opt_flags & OPT_MODELINE)
|| (!value_is_replaced && (*p & P_INSECURE))) { || (!value_is_replaced && (*p & P_INSECURE))) {
secure++; secure = 1;
} }
// Handle side effects, and set the global value // Handle side effects, and set the global value