patch 8.2.0361: internal error when using "0" for a callback
Problem: Internal error when using "0" for a callback.
Solution: Give a normal error. (closes #5743)
diff --git a/src/evalvars.c b/src/evalvars.c
index 227253e..40a22f6 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3643,7 +3643,8 @@
callback_T
get_callback(typval_T *arg)
{
- callback_T res;
+ callback_T res;
+ int r = OK;
res.cb_free_name = FALSE;
if (arg->v_type == VAR_PARTIAL && arg->vval.v_partial != NULL)
@@ -3655,17 +3656,21 @@
else
{
res.cb_partial = NULL;
- if (arg->v_type == VAR_FUNC || arg->v_type == VAR_STRING)
+ if (arg->v_type == VAR_STRING && arg->vval.v_string != NULL
+ && isdigit(*arg->vval.v_string))
+ r = FAIL;
+ else if (arg->v_type == VAR_FUNC || arg->v_type == VAR_STRING)
{
// Note that we don't make a copy of the string.
res.cb_name = arg->vval.v_string;
func_ref(res.cb_name);
}
else if (arg->v_type == VAR_NUMBER && arg->vval.v_number == 0)
- {
res.cb_name = (char_u *)"";
- }
else
+ r = FAIL;
+
+ if (r == FAIL)
{
emsg(_("E921: Invalid callback argument"));
res.cb_name = NULL;
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 37af18c..1a6391b 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -422,4 +422,8 @@
call timer_stop(timer)
endfunc
+func Test_timer_invalid_callback()
+ call assert_fails('call timer_start(0, "0")', 'E921')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 6085320..2c4cd0d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 361,
+/**/
360,
/**/
359,