RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

uucore: format: num_parser: Disallow binary number parsing for floats

Browse source 
Fixes #7487.

Also, add more tests for leading zeros not getting parsed as octal
when dealing with floats.
This commit is contained in:
Nicolas Boichat 2025-03-19 11:17:01 +01:00
parent 97e333c6d9
commit d7502e4b2e
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/uucore/src/lib/features/format/num_parser.rs
View file

@ -81,7 +81,7 @@ impl<'a, T> ExtendedParserError<'a, T> {
/// A number parser for binary, octal, decimal, hexadecimal and single characters.
///
/// It is implemented for `u64`/`i64`, where no fractional part is parsed,
/// and `f64` float, where octal is not allowed.
/// and `f64` float, where octal and binary formats are not allowed.
pub trait ExtendedParser {
// We pick a hopefully different name for our parser, to avoid clash with standard traits.
fn extended_parse(input: &str) -> Result<Self, ExtendedParserError<'_, Self>>
@ -235,12 +235,15 @@ fn parse(
// will not be consumed in case the parsable string contains only "0": the leading extra "0"
// will have no influence on the result.
let (base, rest) = if let Some(rest) = unsigned.strip_prefix('0') {
if let Some(rest) = rest.strip_prefix(['b', 'B']) {
(Base::Binary, rest)
} else if let Some(rest) = rest.strip_prefix(['x', 'X']) {
if let Some(rest) = rest.strip_prefix(['x', 'X']) {
(Base::Hexadecimal, rest)
} else if integral_only {
(Base::Octal, unsigned)
// Binary/Octal only allowed for integer parsing.
if let Some(rest) = rest.strip_prefix(['b', 'B']) {
(Base::Binary, rest)
} else {
(Base::Octal, unsigned)
}
} else {
(Base::Decimal, unsigned)
}
@ -368,6 +371,16 @@ mod tests {
assert_eq!(Ok(-123.15), f64::extended_parse("-123.15"));
assert_eq!(Ok(0.15), f64::extended_parse(".15"));
assert_eq!(Ok(-0.15), f64::extended_parse("-.15"));
// Leading 0(s) are _not_ octal when parsed as float
assert_eq!(Ok(123.0), f64::extended_parse("0123"));
assert_eq!(Ok(123.0), f64::extended_parse("+0123"));
assert_eq!(Ok(-123.0), f64::extended_parse("-0123"));
assert_eq!(Ok(123.0), f64::extended_parse("00123"));
assert_eq!(Ok(123.0), f64::extended_parse("+00123"));
assert_eq!(Ok(-123.0), f64::extended_parse("-00123"));
assert_eq!(Ok(123.15), f64::extended_parse("0123.15"));
assert_eq!(Ok(123.15), f64::extended_parse("+0123.15"));
assert_eq!(Ok(-123.15), f64::extended_parse("-0123.15"));
assert_eq!(
Ok(0.15),
f64::extended_parse(".150000000000000000000000000231313")
@ -429,6 +442,8 @@ mod tests {
u64::extended_parse("0."),
Err(ExtendedParserError::PartialMatch(0, "."))
));
// No float tests, leading zeros get parsed as decimal anyway.
}
#[test]
@ -437,6 +452,16 @@ mod tests {
assert_eq!(Ok(0b1011), u64::extended_parse("0B1011"));
assert_eq!(Ok(0b1011), u64::extended_parse("+0b1011"));
assert_eq!(Ok(-0b1011), i64::extended_parse("-0b1011"));
// Binary not allowed for floats
assert!(matches!(
f64::extended_parse("0b100"),
Err(ExtendedParserError::PartialMatch(0f64, "b100"))
));
assert!(matches!(
f64::extended_parse("0b100.1"),
Err(ExtendedParserError::PartialMatch(0f64, "b100.1"))
));
}
#[test]