Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

test: Reject nan/inf instead of crashing

Browse source 
I really don't want to get into the business of explaining to people
how nan != nan.

Fixes #6655.
This commit is contained in:
Fabian Homborg 2020-02-26 16:42:20 +01:00
parent a53405a7be
commit 70b8fb22e1
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/builtin_test.cpp
View file

@ -665,10 +665,12 @@ static bool parse_number(const wcstring &arg, number_t *number, wcstring_list_t
*number = number_t{integral, 0.0}; *number = number_t{integral, 0.0};
return true; return true;
} else if (got_float && errno != ERANGE) { } else if (got_float && errno != ERANGE && std::isfinite(floating)) {
// Here we parsed an (in range) floating point value that could not be parsed as an integer. // Here we parsed an (in range) floating point value that could not be parsed as an integer.
// Break the floating point value into base and delta. Ensure that base is <= the floating // Break the floating point value into base and delta. Ensure that base is <= the floating
// point value. // point value.
//
// Note that a non-finite number like infinity or NaN doesn't work for us, so we checked above.
double intpart = std::floor(floating); double intpart = std::floor(floating);
double delta = floating - intpart; double delta = floating - intpart;
*number = number_t{static_cast<long long>(intpart), delta}; *number = number_t{static_cast<long long>(intpart), delta};
@ -680,6 +682,11 @@ static bool parse_number(const wcstring &arg, number_t *number, wcstring_list_t
if (errno == -1) { if (errno == -1) {
errors.push_back( errors.push_back(
format_string(_(L"Integer %lld in '%ls' followed by non-digit"), integral, argcs)); format_string(_(L"Integer %lld in '%ls' followed by non-digit"), integral, argcs));
} else if (std::isnan(floating)) {
// NaN is an error as far as we're concerned.
errors.push_back(_(L"Not a number"));
} else if (std::isinf(floating)) {
errors.push_back(_(L"Number is infinite"));
} else { } else {
errors.push_back(format_string(L"%s: '%ls'", std::strerror(errno), argcs)); errors.push_back(format_string(L"%s: '%ls'", std::strerror(errno), argcs));
} }

17
tests/checks/test.fish Normal file
View file

@ -0,0 +1,17 @@
# RUN: %fish %s
#
# Tests for the `test` builtin, aka `[`.
test inf -gt 0
# CHECKERR: Number is infinite
# CHECKERR: {{.*}}test.fish (line {{\d+}}):
# CHECKERR: test inf -gt 0
# CHECKERR: ^
test 5 -eq nan
# CHECKERR: Not a number
# CHECKERR: {{.*}}test.fish (line {{\d+}}):
# CHECKERR: test 5 -eq nan
# CHECKERR: ^
test -z "nan" || echo nan is fine
# CHECK: nan is fine