diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-01-09 13:26:18 +0100 |
|---|---|---|
| committer | bfredl <bjorn.linse@gmail.com> | 2023-01-09 13:59:35 +0100 |
| commit | bb7033a0338e9133765f9b2e1e6dc096847d17e3 (patch) | |
| tree | c38fc839d8c33a0e0068c45242e3f9fc30e59de2 | |
| parent | fc2cd28547954e64ef429c83733f06fa3ee75d50 (diff) | |
| download | rneovim-bb7033a0338e9133765f9b2e1e6dc096847d17e3.tar.gz rneovim-bb7033a0338e9133765f9b2e1e6dc096847d17e3.tar.bz2 rneovim-bb7033a0338e9133765f9b2e1e6dc096847d17e3.zip | |
fix(rpc): don't free args on error in rpc_send_event
fixup #21631
fixes #21690
| -rw-r--r-- | src/nvim/eval/funcs.c | 4 | ||||
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index d377508e27..86bc3b2092 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -6325,12 +6325,12 @@ static void f_rpcnotify(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) bool ok = rpc_send_event((uint64_t)argvars[0].vval.v_number, tv_get_string(&argvars[1]), args); + api_free_array(args); + if (!ok) { semsg(_(e_invarg2), "Channel doesn't exist"); return; } - - api_free_array(args); rettv->vval.v_number = 1; } diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index 5b8e330e15..0c23a7798c 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -100,7 +100,6 @@ bool rpc_send_event(uint64_t id, const char *name, Array args) Channel *channel = NULL; if (id && (!(channel = find_rpc_channel(id)))) { - api_free_array(args); return false; } |