neovim

commit d46ebd2a74036a349606213fcd2a8b3530adebcf
parent a66f6add29fd8b2ee352c6089ceca6ab4f522385
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed, 22 Jan 2025 17:10:29 +0800

fix(startup): avoid crash with completion from -l script (#32160)

Related #27764
Diffstat:
M
src/nvim/drawscreen.c
 | 
7
++-----
M
src/nvim/main.c
 | 
2
+-
M
test/functional/core/main_spec.lua
 | 
12
+++++++++++-

3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
@@ -177,14 +177,11 @@ bool default_grid_alloc(void)
   resizing = true;
 
   // Allocation of the screen buffers is done only when the size changes and
-  // when Rows and Columns have been set and we have started doing full
-  // screen stuff.
+  // when Rows and Columns have been set.
   if ((default_grid.chars != NULL
        && Rows == default_grid.rows
        && Columns == default_grid.cols)
-      || Rows == 0
-      || Columns == 0
-      || (!full_screen && default_grid.chars == NULL)) {
+      || Rows == 0 || Columns == 0) {
     resizing = false;
     return false;
   }
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -360,7 +360,7 @@ int main(int argc, char **argv)
 
   setbuf(stdout, NULL);  // NOLINT(bugprone-unsafe-functions)
 
-  full_screen = !silent_mode || exmode_active;
+  full_screen = !silent_mode;
 
   // Set the default values for the options that use Rows and Columns.
   win_init_size();
diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua
@@ -67,12 +67,22 @@ describe('command-line option', function()
       eq(#'100500\n', attrs.size)
     end)
 
-    it('does not crash when run completion in Ex mode', function()
+    it('does not crash when running completion in Ex mode', function()
       local p =
         n.spawn_wait('--clean', '-e', '-s', '--cmd', 'exe "norm! i\\<C-X>\\<C-V>"', '--cmd', 'qa!')
       eq(0, p.status)
     end)
 
+    it('does not crash when running completion from -l script', function()
+      local lua_fname = 'Xinscompl.lua'
+      write_file(lua_fname, [=[vim.cmd([[exe "norm! i\<C-X>\<C-V>"]])]=])
+      finally(function()
+        os.remove(lua_fname)
+      end)
+      local p = n.spawn_wait('--clean', '-l', lua_fname)
+      eq(0, p.status)
+    end)
+
     it('does not crash after reading from stdin in non-headless mode', function()
       skip(is_os('win'))
       local screen = Screen.new(40, 8)