neovim

commit 614c9322d50052c76fb3e6e1be7536a972ff0902
parent 56fabcadb6df46c70402e4f9cd1b851856fb57e9
Author: phanium <91544758+phanen@users.noreply.github.com>
Date:   Tue, 25 Feb 2025 05:34:49 +0800

fix(lua): SIGSEGV in luv callback with error(nil) #32595

Problem:
luv callback `vim.uv.new_timer():start(0, 0, function() error() end)`
causes SIGSEGV, since `xstrdup` gets NULL from `lua_tostring`.
Similar to: https://github.com/neovim/neovim/commit/a5b1b83a2693ffa7a5a0a22b3693d36ea60051be

Solution:
Check NULL before `xstrdup`.
Diffstat:
M
src/nvim/lua/executor.c
 | 
2
+-
M
test/functional/lua/loop_spec.lua
 | 
35
+++++++++++++++++++++++++++++++++++

2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
@@ -221,7 +221,7 @@ static int nlua_fast_cfpcall(lua_State *lstate, int nargs, int nresult, int flag
     const char *error = lua_tostring(lstate, -1);
 
     multiqueue_put(main_loop.events, nlua_luv_error_event,
-                   xstrdup(error), (void *)(intptr_t)kCallback);
+                   error != NULL ? xstrdup(error) : NULL, (void *)(intptr_t)kCallback);
     lua_pop(lstate, 1);  // error message
     retval = -status;
   } else {  // LUA_OK
diff --git a/test/functional/lua/loop_spec.lua b/test/functional/lua/loop_spec.lua
@@ -159,4 +159,39 @@ describe('vim.uv', function()
   it("is equal to require('luv')", function()
     eq(true, exec_lua("return vim.uv == require('luv')"))
   end)
+
+  it('non-string error() #32595', function()
+    local screen = Screen.new(50, 10)
+    exec_lua(function()
+      local timer = assert(vim.uv.new_timer())
+      timer:start(0, 0, function()
+        timer:close()
+        error(nil)
+      end)
+    end)
+    local s = [[
+                                                        |
+      {1:~                                                 }|*5
+      {3:                                                  }|
+      {9:Error executing callback:}                         |
+      {9:[NULL]}                                            |
+      {6:Press ENTER or type command to continue}^           |
+    ]]
+    screen:expect(s)
+    feed('<cr>')
+    n.assert_alive()
+    screen:expect([[
+      ^                                                  |
+      {1:~                                                 }|*8
+                                                        |
+    ]])
+    exec_lua(function()
+      vim.uv.fs_stat('non-existent-file', function()
+        error(nil)
+      end)
+    end)
+    screen:expect(s)
+    feed('<cr>')
+    n.assert_alive()
+  end)
 end)