RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

seq: add overflow checks when parsing exponents (#6858)

Browse source 
* seq: remove ignore flag from test_invalid_float_point_fail_properly(#6235)

* seq: prevent overflow in parse_exponent_no_decimal

* seq: add tests for invalid floating point arguments

* seq: add overflow checks when parsing decimal with exponent

* seq: add overflow checks
This commit is contained in:
steinwand6 2024-11-21 00:11:04 +09:00 • committed by GitHub
parent df1203af9f
commit c986fb7d2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/uu/seq/src/numberparse.rs
View file

@ -106,16 +106,20 @@ fn parse_exponent_no_decimal(s: &str, j: usize) -> Result<PreciseNumber, ParseNu
let num_integral_digits = if is_minus_zero_float(s, &x) { let num_integral_digits = if is_minus_zero_float(s, &x) {
if exponent > 0 { if exponent > 0 {
2usize + exponent as usize (2usize)
.checked_add(exponent as usize)
.ok_or(ParseNumberError::Float)?
} else { } else {
2usize 2usize
} }
} else { } else {
let total = j as i64 + exponent; let total = (j as i64)
.checked_add(exponent)
.ok_or(ParseNumberError::Float)?;
let result = if total < 1 { let result = if total < 1 {
1 1
} else { } else {
total.try_into().unwrap() total.try_into().map_err(|_| ParseNumberError::Float)?
}; };
if x.sign() == Sign::Minus { if x.sign() == Sign::Minus {
result + 1 result + 1
@ -207,7 +211,9 @@ fn parse_decimal_and_exponent(
let integral_part: f64 = s[..j].parse().map_err(|_| ParseNumberError::Float)?; let integral_part: f64 = s[..j].parse().map_err(|_| ParseNumberError::Float)?;
if integral_part.is_sign_negative() { if integral_part.is_sign_negative() {
if exponent > 0 { if exponent > 0 {
2usize + exponent as usize 2usize
.checked_add(exponent as usize)
.ok_or(ParseNumberError::Float)?
} else { } else {
2usize 2usize
} }
@ -217,15 +223,20 @@ fn parse_decimal_and_exponent(
}; };
// Special case: if the string is "-.1e2", we need to treat it // Special case: if the string is "-.1e2", we need to treat it
// as if it were "-0.1e2". // as if it were "-0.1e2".
let total = if s.starts_with("-.") { let total = {
i as i64 + exponent + 1 let total = (i as i64)
} else { .checked_add(exponent)
i as i64 + exponent .ok_or(ParseNumberError::Float)?;
if s.starts_with("-.") {
total.checked_add(1).ok_or(ParseNumberError::Float)?
} else {
total
}
}; };
if total < minimum as i64 { if total < minimum as i64 {
minimum minimum
} else { } else {
total.try_into().unwrap() total.try_into().map_err(|_| ParseNumberError::Float)?
} }
}; };

14
tests/by-util/test_seq.rs
View file

@ -777,12 +777,22 @@ fn test_undefined() {
} }
#[test] #[test]
#[ignore = "Need issue #6235 to be fixed"]
fn test_invalid_float_point_fail_properly() { fn test_invalid_float_point_fail_properly() {
new_ucmd!() new_ucmd!()
.args(&["66000e000000000000000000000000000000000000000000000000000009223372036854775807"]) .args(&["66000e000000000000000000000000000000000000000000000000000009223372036854775807"])
.fails() .fails()
.stdout_only(""); // might need to be updated .no_stdout()
.usage_error("invalid floating point argument: '66000e000000000000000000000000000000000000000000000000000009223372036854775807'");
new_ucmd!()
.args(&["-1.1e9223372036854775807"])
.fails()
.no_stdout()
.usage_error("invalid floating point argument: '-1.1e9223372036854775807'");
new_ucmd!()
.args(&["-.1e9223372036854775807"])
.fails()
.no_stdout()
.usage_error("invalid floating point argument: '-.1e9223372036854775807'");
} }
#[test] #[test]