diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-24 14:02:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-24 14:02:04 +0100 |
| commit | 82b033eff82d3ed0da77fd5f5a1c023766acabba (patch) | |
| tree | 044982426b63e83769cda707b56da4d5c2b9d2b5 | |
| parent | 63dbfd33c1d47400c62775842b5b750ee69e2383 (diff) | |
| download | vim-git-82b033eff82d3ed0da77fd5f5a1c023766acabba.tar.gz | |
patch 8.1.1046: the "secure" variable is used inconsistentlyv8.1.1046
Problem: the "secure" variable is used inconsistently. (Justin M. Keyes)
Solution: Set it to one instead of incrementing.
| -rw-r--r-- | src/buffer.c | 2 | ||||
| -rw-r--r-- | src/option.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 158c30a5a..6cfa41fab 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5498,7 +5498,7 @@ chk_modeline( current_sctx.sc_lnum = 0; #endif // Make sure no risky things are executed as a side effect. - ++secure; + secure = 1; retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags); diff --git a/src/option.c b/src/option.c index f9cbcbd7b..8149521fc 100644 --- a/src/option.c +++ b/src/option.c @@ -5151,13 +5151,12 @@ do_set( // effects in secure mode. Also when the value was // set with the P_INSECURE flag and is not // completely replaced. - if (secure + if ((opt_flags & OPT_MODELINE) #ifdef HAVE_SANDBOX - || sandbox != 0 + || sandbox != 0 #endif - || (opt_flags & OPT_MODELINE) - || (!value_is_replaced && (*p & P_INSECURE))) - ++secure; + || (!value_is_replaced && (*p & P_INSECURE))) + secure = 1; // Handle side effects, and set the global value // for ":set" on local options. Note: when setting diff --git a/src/version.c b/src/version.c index 133fd3e57..3a195e5c4 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1046, +/**/ 1045, /**/ 1044, |