From bc0635a9fc9c15a2423d4eb35f627d127d00fa46 Mon Sep 17 00:00:00 2001 From: skewb1k Date: Tue, 9 Dec 2025 21:59:06 +0300 Subject: fix(lua): vim.wait(math.huge) fails #36885 Problem: `nlua_wait()` uses `luaL_checkinteger()` which doesn't support `math.huge` since it's double type. On PUC Lua this fails with 'number has no integer representation' error and on LuaJIT this overflows int. Solution: Use `luaL_checknumber()` and handle `math.huge`. --- src/nvim/lua/executor.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/nvim/lua/executor.c') diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 124fce58b6..30d3f26f0e 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -451,10 +452,19 @@ static int nlua_wait(lua_State *lstate) return luaL_error(lstate, e_fast_api_disabled, "vim.wait"); } - intptr_t timeout = luaL_checkinteger(lstate, 1); - if (timeout < 0) { + double timeout_number = luaL_checknumber(lstate, 1); + if (timeout_number < 0) { return luaL_error(lstate, "timeout must be >= 0"); } + int64_t timeout; + if (isinf(timeout_number) || timeout_number > (double)INT64_MAX) { + timeout = INT64_MAX; + } else { + if (isnan(timeout_number) || timeout_number != trunc(timeout_number)) { + return luaL_error(lstate, "timeout has no integer representation"); + } + timeout = (int64_t)timeout_number; + } int lua_top = lua_gettop(lstate); @@ -510,7 +520,7 @@ static int nlua_wait(lua_State *lstate) LOOP_PROCESS_EVENTS_UNTIL(&main_loop, loop_events, - (int)timeout, + timeout, got_int || (is_function ? nlua_wait_condition(lstate, &pcall_status, &callback_result, -- cgit