aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-07-21 19:55:05 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-08-02 12:00:01 -0400
commit2d34ddb3c3a3ebbc515e2f8c37c63d0c7fed1387 (patch)
tree86258ab2322f15e4c2f9ad638e64c0d8058da5cf
parent9443d3994190943c2b9d8c4efefcf3de854ec7be (diff)
downloadrneovim-2d34ddb3c3a3ebbc515e2f8c37c63d0c7fed1387.tar.gz
rneovim-2d34ddb3c3a3ebbc515e2f8c37c63d0c7fed1387.tar.bz2
rneovim-2d34ddb3c3a3ebbc515e2f8c37c63d0c7fed1387.zip
vim-patch:8.2.1265: crash with EXITFREE when split() fails
Problem: Crash with EXITFREE when split() fails. Solution: Restore 'cpoptions'. https://github.com/vim/vim/commit/7d5e744162c1e971e5a863e89787cadc8e56051c
-rw-r--r--src/nvim/eval/funcs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index e350d09935..b97bd6b10d 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -9519,7 +9519,7 @@ static void f_split(typval_T *argvars, typval_T *rettv, FunPtr fptr)
tv_list_alloc_ret(rettv, kListLenMayKnow);
if (typeerr) {
- return;
+ goto theend;
}
regmatch_T regmatch = {
@@ -9563,6 +9563,7 @@ static void f_split(typval_T *argvars, typval_T *rettv, FunPtr fptr)
vim_regfree(regmatch.regprog);
}
+theend:
p_cpo = save_cpo;
}