Mercurial > vim

changeset 21429:16bc2bd050e0 v8.2.1265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1265: crash with EXITFREE when split() fails Commit: https://github.com/vim/vim/commit/7d5e744162c1e971e5a863e89787cadc8e56051c Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 21 22:25:51 2020 +0200 patch 8.2.1265: crash with EXITFREE when split() fails Problem: Crash with EXITFREE when split() fails. Solution: Restore 'cpoptions'.
author Bram Moolenaar <Bram@vim.org>
date Tue, 21 Jul 2020 22:30:05 +0200
parents 6dc6978d09ca
children 6eae4256d8b3
files src/evalfunc.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7859,9 +7859,9 @@ f_split(typval_T *argvars, typval_T *ret
 	pat = (char_u *)"[\\x01- ]\\+";
 
     if (rettv_list_alloc(rettv) == FAIL)
-	return;
+	goto theend;
     if (typeerr)
-	return;
+	goto theend;
 
     regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
     if (regmatch.regprog != NULL)
@@ -7898,6 +7898,7 @@ f_split(typval_T *argvars, typval_T *ret
 	vim_regfree(regmatch.regprog);
     }
 
+theend:
     p_cpo = save_cpo;
 }
 
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1265,
+/**/
     1264,
 /**/
     1263,