patch 9.1.1097: --log with non-existent path causes a crash

Problem:  --log with non-existent path causes a crash
          (Ekkosun)
Solution: split initialization phase and init the execution stack
          earlier (Hirohito Higashi)

fixes: #16606
closes: #16610

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/main.c b/src/main.c
index ecc61f4d0be886ae923887a7e8adb469c79af342..f603a52a52e09d24c55d3bb1b7ccc612782dcbfe 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -144,6 +144,11 @@ main
     atexit(vim_mem_profile_dump);
 #endif
 
+    /*
+     * Various initialisations #1 shared with tests.
+     */
+    common_init_1();
+
 #if defined(STARTUPTIME) || defined(FEAT_JOB_CHANNEL)
     // Need to find "--startuptime" and "--log" before actually parsing
     // arguments.
@@ -185,9 +190,9 @@ main
 #endif
 
     /*
-     * Various initialisations shared with tests.
+     * Various initialisations #2 shared with tests.
      */
-    common_init(&params);
+    common_init_2(&params);
 
 #ifdef VIMDLL
     // Check if the current executable file is for the GUI subsystem.
@@ -900,10 +905,10 @@ vim_main2(void)
 }
 
 /*
- * Initialisation shared by main() and some tests.
+ * Initialisation #1 shared by main() and some tests.
  */
     void
-common_init(mparm_T *paramp)
+common_init_1(void)
 {
     estack_init();
     cmdline_init();
@@ -925,7 +930,15 @@ common_init(mparm_T *paramp)
            || (NameBuff = alloc(MAXPATHL)) == NULL)
        mch_exit(0);
     TIME_MSG("Allocated generic buffers");
+}
+
 
+/*
+ * Initialisation #2 shared by main() and some tests.
+ */
+    void
+common_init_2(mparm_T *paramp)
+{
 #ifdef NBDEBUG
     // Wait a moment for debugging NetBeans.  Must be after allocating
     // NameBuff.

diff --git a/src/message_test.c b/src/message_test.c
index 62f7772470d0e4d8c691e20a63006a06b899cbb8..83767ece9308994602be7e5729341f98a4655392 100644 (file)
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -508,7 +508,8 @@ main(int argc, char **argv)
     CLEAR_FIELD(params);
     params.argc = argc;
     params.argv = argv;
-    common_init(&params);
+    common_init_1();
+    common_init_2(&params);
 
     set_option_value_give_err((char_u *)"encoding", 0, (char_u *)"utf-8", 0);
     init_chartab();

diff --git a/src/proto/main.pro b/src/proto/main.pro
index 496fe66be6950da91917a8b9e38cee7722985e37..7e4c50803e8ef2e4cdb274e40fa705dbb770face 100644 (file)
--- a/src/proto/main.pro
+++ b/src/proto/main.pro
@@ -1,6 +1,7 @@
 /* main.c */
 int vim_main2(void);
-void common_init(mparm_T *paramp);
+void common_init_1(void);
+void common_init_2(mparm_T *paramp);
 int is_not_a_term(void);
 int is_not_a_term_or_gui(void);
 void free_vbuf(void);

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 7c703916045e70e11bf08d49d275a93df41a4492..c16e4ae27de3b22a17bf831c2969f3a063b37b77 100644 (file)
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -740,6 +740,13 @@ func Test_log()
   call delete('Xlogfile')
 endfunc
 
+func Test_log_nonexistent()
+  " this used to crash Vim
+  CheckFeature channel
+  let result = join(systemlist(GetVimCommand() .. ' --log /X/Xlogfile -c qa!'))
+  call assert_match("E484: Can't open file", result)
+endfunc
+
 func Test_read_stdin()
   let after =<< trim [CODE]
     write Xtestout

diff --git a/src/version.c b/src/version.c
index be4b7e74b60628332fce25f0ec6c82b8725442bd..0a254e5cf54fdac6e9e5a01b1c19349fced00c00 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1097,
 /**/
     1096,
 /**/