patch 8.2.2122: Vim9: crash when sourcing vim9script early
Problem: Vim9: crash when sourcing vim9script early.
Solution: Use set_option_value() instead of setting p_cpo directly.
(closes #7441)
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 7e5ea4c..bf4cbc0 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1491,8 +1491,7 @@
si = SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_save_cpo != NULL)
{
- free_string_option(p_cpo);
- p_cpo = si->sn_save_cpo;
+ set_option_value((char_u *)"cpo", 0L, si->sn_save_cpo, 0);
si->sn_save_cpo = NULL;
}
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 7012f9e..72a373a 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -2857,6 +2857,17 @@
delete('Xdidit')
enddef
+def Test_restoring_cpo()
+ writefile(['vim9script', 'set nocp'], 'Xsourced')
+ writefile(['call writefile(["done"], "Xdone")', 'quit!'], 'Xclose')
+ if RunVim([], [], '-u NONE +"set cpo+=a" -S Xsourced -S Xclose')
+ assert_equal(['done'], readfile('Xdone'))
+ endif
+ delete('Xsourced')
+ delete('Xclose')
+enddef
+
+
def Test_unset_any_variable()
var lines =<< trim END
var name: any
diff --git a/src/version.c b/src/version.c
index 9bb587d..8eec20e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2122,
+/**/
2121,
/**/
2120,