aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.3309: Vim9: divide by zero causes a crash

Browse Source 
Problem:    Vim9: divide by zero causes a crash.
Solution:   Give an error message. (closes #8727)
This commit is contained in:
Bram Moolenaar
2021-08-07 15:50:23 +02:00
parent 6ce46b9963
commit fbeefb1b87
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/testdir/test_vim9_expr.vim
View File

@@ -1348,7 +1348,7 @@ enddef
def Test_expr5_vim9script_channel() def Test_expr5_vim9script_channel()
if !has('channel') if !has('channel')
MissingFeature 'float' MissingFeature 'channel'
else else
var lines =<< trim END var lines =<< trim END
echo 'a' .. test_null_job() echo 'a' .. test_null_job()
@@ -1502,6 +1502,18 @@ def Test_expr6()
CheckDefExecAndScriptFailure(['echo 1 / 0'], 'E1154', 1) CheckDefExecAndScriptFailure(['echo 1 / 0'], 'E1154', 1)
CheckDefExecAndScriptFailure(['echo 1 % 0'], 'E1154', 1) CheckDefExecAndScriptFailure(['echo 1 % 0'], 'E1154', 1)
lines =<< trim END
var n = 0
eval 1 / n
END
CheckDefExecAndScriptFailure(lines, 'E1154', 2)
lines =<< trim END
var n = 0
eval 1 % n
END
CheckDefExecAndScriptFailure(lines, 'E1154', 2)
enddef enddef
def Test_expr6_vim9script() def Test_expr6_vim9script()

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3309,
/**/ /**/
3308, 3308,
/**/ /**/

23
src/vim9execute.c
View File

@@ -3435,13 +3435,22 @@ exec_instructions(ectx_T *ectx)
typval_T *tv2 = STACK_TV_BOT(-1); typval_T *tv2 = STACK_TV_BOT(-1);
varnumber_T arg1 = tv1->vval.v_number; varnumber_T arg1 = tv1->vval.v_number;
varnumber_T arg2 = tv2->vval.v_number; varnumber_T arg2 = tv2->vval.v_number;
varnumber_T res; varnumber_T res = 0;
int div_zero = FALSE;
switch (iptr->isn_arg.op.op_type) switch (iptr->isn_arg.op.op_type)
{ {
case EXPR_MULT: res = arg1 * arg2; break; case EXPR_MULT: res = arg1 * arg2; break;
case EXPR_DIV: res = arg1 / arg2; break; case EXPR_DIV: if (arg2 == 0)
case EXPR_REM: res = arg1 % arg2; break; div_zero = TRUE;
else
res = arg1 / arg2;
break;
case EXPR_REM: if (arg2 == 0)
div_zero = TRUE;
else
res = arg1 % arg2;
break;
case EXPR_SUB: res = arg1 - arg2; break; case EXPR_SUB: res = arg1 - arg2; break;
case EXPR_ADD: res = arg1 + arg2; break; case EXPR_ADD: res = arg1 + arg2; break;
@@ -3451,7 +3460,7 @@ exec_instructions(ectx_T *ectx)
case EXPR_GEQUAL: res = arg1 >= arg2; break; case EXPR_GEQUAL: res = arg1 >= arg2; break;
case EXPR_SMALLER: res = arg1 < arg2; break; case EXPR_SMALLER: res = arg1 < arg2; break;
case EXPR_SEQUAL: res = arg1 <= arg2; break; case EXPR_SEQUAL: res = arg1 <= arg2; break;
default: res = 0; break; default: break;
} }
--ectx->ec_stack.ga_len; --ectx->ec_stack.ga_len;
@@ -3462,6 +3471,12 @@ exec_instructions(ectx_T *ectx)
} }
else else
tv1->vval.v_number = res; tv1->vval.v_number = res;
if (div_zero)
{
SOURCING_LNUM = iptr->isn_lnum;
emsg(_(e_divide_by_zero));
goto on_error;
}
} }
break; break;