Mercurial > vim
changeset 23669:cf2904dd9691 v8.2.2376
patch 8.2.2376: Vim9: crash when dividing by zero in compiled code
Commit: https://github.com/vim/vim/commit/e64f83cc6aba05baa61ba4a4cb8d4447b8091e5b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 19 22:16:41 2021 +0100
patch 8.2.2376: Vim9: crash when dividing by zero in compiled code
Problem: Vim9: crash when dividing by zero in compiled code using
constants.
Solution: Call num_divide() and num_modulus(). (closes #7704)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 19 Jan 2021 22:30:08 +0100 |
| parents | 4e893aa1380c |
| children | f215e3b3137c |
| files | src/testdir/test_vim9_expr.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1376,6 +1376,7 @@ def Test_expr6() assert_equal(1, g:anint / 6) assert_equal(2, g:anint / g:thefour) + assert_true(1 / 0 > 99999) assert_equal(5, 11 % 6) assert_equal(4, g:anint % 6) @@ -1383,6 +1384,7 @@ def Test_expr6() g:anint) assert_equal(2, g:anint % g:thefour) + assert_equal(0, 1 % 0) assert_equal(4, 6 * 4 / 6)
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2376, +/**/ 2375, /**/ 2374,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4300,9 +4300,11 @@ compile_expr6(char_u **arg, cctx_T *cctx { case '*': res = tv1->vval.v_number * tv2->vval.v_number; break; - case '/': res = tv1->vval.v_number / tv2->vval.v_number; + case '/': res = num_divide(tv1->vval.v_number, + tv2->vval.v_number); break; - case '%': res = tv1->vval.v_number % tv2->vval.v_number; + case '%': res = num_modulus(tv1->vval.v_number, + tv2->vval.v_number); break; } tv1->vval.v_number = res;