diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-20 08:08:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 08:08:50 +0800 |
| commit | 77eb6f9dc75ebe00aa835441ad623ba46d7108bb (patch) | |
| tree | 9a968c1c192ea892f68b23c817fe487dc89df72d /src | |
| parent | 2ab52bd9889790dc7e47a09e801751aada418727 (diff) | |
| download | rneovim-77eb6f9dc75ebe00aa835441ad623ba46d7108bb.tar.gz rneovim-77eb6f9dc75ebe00aa835441ad623ba46d7108bb.tar.bz2 rneovim-77eb6f9dc75ebe00aa835441ad623ba46d7108bb.zip | |
fix(api, lua): return NIL on failure to find converted function (#17779)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/private/converter.c | 3 | ||||
| -rw-r--r-- | src/nvim/lua/converter.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/api/private/converter.c b/src/nvim/api/private/converter.c index 82ec1ad0d8..a26383ec7d 100644 --- a/src/nvim/api/private/converter.c +++ b/src/nvim/api/private/converter.c @@ -65,8 +65,7 @@ typedef struct { #define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \ do { \ ufunc_T *fp = find_func(fun); \ - assert(fp != NULL); \ - if (fp->uf_cb == nlua_CFunction_func_call) { \ + if (fp != NULL && fp->uf_cb == nlua_CFunction_func_call) { \ LuaRef ref = api_new_luaref(((LuaCFunctionState *)fp->uf_cb_state)->lua_callable.func_ref); \ kvi_push(edata->stack, LUAREF_OBJ(ref)); \ } else { \ diff --git a/src/nvim/lua/converter.c b/src/nvim/lua/converter.c index 0bb224c729..ef49a03660 100644 --- a/src/nvim/lua/converter.c +++ b/src/nvim/lua/converter.c @@ -477,8 +477,7 @@ static bool typval_conv_special = false; #define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \ do { \ ufunc_T *fp = find_func(fun); \ - assert(fp != NULL); \ - if (fp->uf_cb == nlua_CFunction_func_call) { \ + if (fp != NULL && fp->uf_cb == nlua_CFunction_func_call) { \ nlua_pushref(lstate, ((LuaCFunctionState *)fp->uf_cb_state)->lua_callable.func_ref); \ } else { \ TYPVAL_ENCODE_CONV_NIL(tv); \ |