1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 23 May 2019 17:08:49 +0200
Subject: patch 8.1.1367: can set 'modelineexpr' in modeline
Problem: can set 'modelineexpr' in modeline.
Solution: Add P_SECURE flag.
(cherry picked from commit 7e800c6047c8a9cc3e5cbc019a4dc91ec36616b1)
Signed-off-by: James McCoy <jamessan@debian.org>
---
src/option.c | 2 +-
src/testdir/test_modeline.vim | 1 +
src/version.c | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/option.c b/src/option.c
index e17ecdf..b2ab8ff 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1872,7 +1872,7 @@ static struct vimoption options[] =
{"modeline", "ml", P_BOOL|P_VIM,
(char_u *)&p_ml, PV_ML,
{(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
- {"modelineexpr", "mle", P_BOOL|P_VI_DEF,
+ {"modelineexpr", "mle", P_BOOL|P_VI_DEF|P_SECURE,
(char_u *)&p_mle, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
{"modelines", "mls", P_NUM|P_VI_DEF,
diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index 101116c..89c06ba 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -119,6 +119,7 @@ func Test_modeline_fails_always()
call s:modeline_fails('makespellmem', 'makespellmem=Something()', 'E520:')
call s:modeline_fails('mzschemedll', 'mzschemedll=Something()', 'E520:')
call s:modeline_fails('mzschemegcdll', 'mzschemegcdll=Something()', 'E520:')
+ call s:modeline_fails('modelineexpr', 'modelineexpr', 'E520:')
call s:modeline_fails('omnifunc', 'omnifunc=Something()', 'E520:')
call s:modeline_fails('operatorfunc', 'operatorfunc=Something()', 'E520:')
call s:modeline_fails('perldll', 'perldll=Something()', 'E520:')
diff --git a/src/version.c b/src/version.c
index e1833af..f9c185f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1195,6 +1195,8 @@ static int included_patches[] =
*/
static char *(extra_patches[]) =
{ /* Add your patch description below this line */
+/**/
+ "8.1.1367",
/**/
"8.1.1366",
/**/
|
