Mercurial > vim
changeset 27402:898f520e798b v8.2.4229
patch 8.2.4229: possible crash when invoking timer callback fails
Commit: https://github.com/vim/vim/commit/745b938a48104778dcb7b0245e6589b54cb93593
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 27 13:55:35 2022 +0000
patch 8.2.4229: possible crash when invoking timer callback fails
Problem: Possible crash when invoking timer callback fails.
Solution: Initialize the typval. Give an error for an empty callback.
(closes #9636)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 27 Jan 2022 15:00:06 +0100 |
| parents | 2e0189a2be26 |
| children | 3ea354ce9f5f |
| files | src/testdir/test_vim9_builtin.vim src/time.c src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -4132,6 +4132,8 @@ enddef def Test_timer_start() CheckDefAndScriptFailure(['timer_start("a", "1")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1210: Number required for argument 1']) CheckDefAndScriptFailure(['timer_start(1, "1", [1])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<number>', 'E1206: Dictionary required for argument 3']) + CheckDefExecAndScriptFailure(['timer_start(100, 0)'], 'E921:') + CheckDefExecAndScriptFailure(['timer_start(100, "")'], 'E921:') enddef def Test_timer_stop()
--- a/src/time.c +++ b/src/time.c @@ -481,6 +481,7 @@ timer_callback(timer_T *timer) argv[0].vval.v_number = (varnumber_T)timer->tr_id; argv[1].v_type = VAR_UNKNOWN; + rettv.v_type = VAR_UNKNOWN; call_callback(&timer->tr_callback, -1, &rettv, 1, argv); clear_tv(&rettv); } @@ -854,6 +855,13 @@ f_timer_start(typval_T *argvars, typval_ callback = get_callback(&argvars[1]); if (callback.cb_name == NULL) return; + if (in_vim9script() && *callback.cb_name == NUL) + { + // empty callback is not useful for a timer + emsg(_(e_invalid_callback_argument)); + free_callback(&callback); + return; + } timer = create_timer(msec, repeat); if (timer == NULL)