Skip to content

parse_number can raise error about length #1725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2020
Merged

parse_number can raise error about length #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,8 @@ def test(f, format_spec, result):
test(12345.6, "1=20", '111111111111112345.6')
test(12345.6, "*=20", '*************12345.6')

@unittest.skip("TODO: RUSTPYTHON")
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_format_spec_errors(self):
# int, float, and string all share the same format spec
# mini-language parser.
Expand Down
28 changes: 15 additions & 13 deletions vm/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,17 @@ fn parse_fill_and_align(text: &str) -> (Option<char>, Option<FormatAlign>, &str)
}
}

fn parse_number(text: &str) -> (Option<usize>, &str) {
fn parse_number(text: &str) -> Result<(Option<usize>, &str), &'static str> {
let num_digits: usize = get_num_digits(text);
if num_digits == 0 {
return (None, text);
return Ok((None, text));
}
if let Ok(num) = text[..num_digits].parse::<usize>() {
Ok((Some(num), &text[num_digits..]))
} else {
// NOTE: this condition is different from CPython
Err("Too many decimal digits in format string")
}
// This should never fail
(
Some(text[..num_digits].parse::<usize>().unwrap()),
&text[num_digits..],
)
}

fn parse_sign(text: &str) -> (Option<FormatSign>, &str) {
Expand Down Expand Up @@ -193,19 +194,19 @@ fn parse_zero(text: &str) -> (bool, &str) {
}
}

fn parse_precision(text: &str) -> (Option<usize>, &str) {
fn parse_precision(text: &str) -> Result<(Option<usize>, &str), &'static str> {
let mut chars = text.chars();
match chars.next() {
Ok(match chars.next() {
Some('.') => {
let (size, remaining) = parse_number(&chars.as_str());
let (size, remaining) = parse_number(&chars.as_str())?;
if size.is_some() {
(size, remaining)
} else {
(None, text)
}
}
_ => (None, text),
}
})
}

fn parse_grouping_option(text: &str) -> (Option<FormatGrouping>, &str) {
Expand Down Expand Up @@ -239,14 +240,15 @@ fn parse_format_type(text: &str) -> (Option<FormatType>, &str) {
}

fn parse_format_spec(text: &str) -> Result<FormatSpec, &'static str> {
// get_integer in CPython
let (preconversor, after_preconversor) = parse_preconversor(text);
let (mut fill, mut align, after_align) = parse_fill_and_align(after_preconversor);
let (sign, after_sign) = parse_sign(after_align);
let (alternate_form, after_alternate_form) = parse_alternate_form(after_sign);
let (zero, after_zero) = parse_zero(after_alternate_form);
let (width, after_width) = parse_number(after_zero);
let (width, after_width) = parse_number(after_zero)?;
let (grouping_option, after_grouping_option) = parse_grouping_option(after_width);
let (precision, after_precision) = parse_precision(after_grouping_option);
let (precision, after_precision) = parse_precision(after_grouping_option)?;
let (format_type, after_format_type) = parse_format_type(after_precision);
if !after_format_type.is_empty() {
return Err("Invalid format specifier");
Expand Down