Commit 33cddcdf authored by Abdelhakeem's avatar Abdelhakeem Committed by James McCoy

vim-patch:8.1.0539: cannot build without the sandbox

Problem:    Cannot build without the sandbox.
Solution:   Set the secure option instead of using the sandbox.  Also restrict
            the characters from 'spelllang' that are used for LANG.vim.
            (suggested by Yasuhiro Matsumoto)
https://github.com/vim/vim/commit/82e8c92ebef5afcac0c0fdb706ff163f9b3366f7

(cherry picked from commit adff3f4d)
Signed-off-by: James McCoy's avatarJames McCoy <jamessan@debian.org>
parent 5c85e032
......@@ -5527,7 +5527,7 @@ A jump table for the options with a short description can be found at |Q_op|.
After this option has been set successfully, Vim will source the files
"spell/LANG.vim" in 'runtimepath'. "LANG" is the value of 'spelllang'
up to the first comma, dot or underscore.
up to the first character that is not an ASCII letter and not a dash.
Also see |set-spc-auto|.
......
......@@ -4926,11 +4926,11 @@ chk_modeline (
save_SID = current_SID;
current_SID = SID_MODELINE;
// Make sure no risky things are executed as a side effect.
sandbox++;
++secure;
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
sandbox--;
--secure;
current_SID = save_SID;
if (retval == FAIL) /* stop if error found */
break;
......
......@@ -3287,11 +3287,13 @@ did_set_string_option (
* '.encoding'.
*/
for (p = q; *p != NUL; ++p)
if (vim_strchr((char_u *)"_.,", *p) != NULL)
if (!ASCII_ISALPHA(*p) && *p != '-')
break;
vim_snprintf((char *)fname, sizeof(fname), "spell/%.*s.vim",
(int)(p - q), q);
source_runtime(fname, DIP_ALL);
if (p > q) {
vim_snprintf((char *)fname, sizeof(fname), "spell/%.*s.vim",
(int)(p - q), q);
source_runtime(fname, DIP_ALL);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment