mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0990: floating point exception with "%= 0" and "/= 0"

Browse Source 
Problem:    Floating point exception with "%= 0" and "/= 0".
Solution:   Avoid dividing by zero. (Dominique Pelle, closes vim/vim#4058)
e21c1580b7
This commit is contained in:
Jan Edmund Lazo
2019-07-28 16:54:06 -04:00
parent 98d389ce55
commit b457a58e34
3 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/nvim/eval.c
View File

@@ -526,6 +526,35 @@ const list_T *eval_msgpack_type_lists[] = {
[kMPExt] = NULL,
};
// Return "n1" divided by "n2", taking care of dividing by zero.
varnumber_T num_divide(varnumber_T n1, varnumber_T n2)
FUNC_ATTR_CONST FUNC_ATTR_WARN_UNUSED_RESULT
{
varnumber_T result;
if (n2 == 0) { // give an error message?
if (n1 == 0) {
result = VARNUMBER_MIN; // similar to NaN
} else if (n1 < 0) {
result = -VARNUMBER_MAX;
} else {
result = VARNUMBER_MAX;
}
} else {
result = n1 / n2;
}
return result;
}
// Return "n1" modulus "n2", taking care of dividing by zero.
varnumber_T num_modulus(varnumber_T n1, varnumber_T n2)
FUNC_ATTR_CONST FUNC_ATTR_WARN_UNUSED_RESULT
{
// Give an error when n2 is 0?
return (n2 == 0) ? 0 : (n1 % n2);
}
/*
* Initialize the global and v: variables.
*/
@@ -2047,8 +2076,8 @@ static char_u *ex_let_one(char_u *arg, typval_T *const tv,
case '+': n = numval + n; break;
case '-': n = numval - n; break;
case '*': n = numval * n; break;
case '/': n = numval / n; break;
case '%': n = numval % n; break;
case '/': n = num_divide(numval, n); break;
case '%': n = num_modulus(numval, n); break;
}
} else if (opt_type == 0 && stringval != NULL) { // string
char *const oldstringval = stringval;
@@ -4178,22 +4207,9 @@ static int eval6(char_u **arg, typval_T *rettv, int evaluate, int want_string)
if (op == '*') {
n1 = n1 * n2;
} else if (op == '/') {
if (n2 == 0) { // give an error message?
if (n1 == 0) {
n1 = VARNUMBER_MIN; // similar to NaN
} else if (n1 < 0) {
n1 = -VARNUMBER_MAX;
} else {
n1 = VARNUMBER_MAX;
}
} else {
n1 = n1 / n2;
}
n1 = num_divide(n1, n2);
} else {
if (n2 == 0) /* give an error message? */
n1 = 0;
else
n1 = n1 % n2;
n1 = num_modulus(n1, n2);
}
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = n1;