Fix println! ICE when parsing percent prefix number
This commit is contained in:
parent
be7549f82c
commit
582fd1fb53
3 changed files with 49 additions and 9 deletions
|
@ -263,13 +263,13 @@ pub(crate) mod printf {
|
|||
}
|
||||
|
||||
impl Num {
|
||||
fn from_str(s: &str, arg: Option<&str>) -> Self {
|
||||
fn from_str(s: &str, arg: Option<&str>) -> Option<Self> {
|
||||
if let Some(arg) = arg {
|
||||
Num::Arg(arg.parse().unwrap_or_else(|_| panic!("invalid format arg `{arg:?}`")))
|
||||
arg.parse().ok().map(|arg| Num::Arg(arg))
|
||||
} else if s == "*" {
|
||||
Num::Next
|
||||
Some(Num::Next)
|
||||
} else {
|
||||
Num::Num(s.parse().unwrap_or_else(|_| panic!("invalid format num `{s:?}`")))
|
||||
s.parse().ok().map(|num| Num::Num(num))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -421,7 +421,10 @@ pub(crate) mod printf {
|
|||
state = Prec;
|
||||
parameter = None;
|
||||
flags = "";
|
||||
width = Some(Num::from_str(at.slice_between(end).unwrap(), None));
|
||||
width = at.slice_between(end).and_then(|num| Num::from_str(num, None));
|
||||
if width.is_none() {
|
||||
return fallback();
|
||||
}
|
||||
move_to!(end);
|
||||
}
|
||||
// It's invalid, is what it is.
|
||||
|
@ -452,7 +455,10 @@ pub(crate) mod printf {
|
|||
'1'..='9' => {
|
||||
let end = at_next_cp_while(next, char::is_ascii_digit);
|
||||
state = Prec;
|
||||
width = Some(Num::from_str(at.slice_between(end).unwrap(), None));
|
||||
width = at.slice_between(end).and_then(|num| Num::from_str(num, None));
|
||||
if width.is_none() {
|
||||
return fallback();
|
||||
}
|
||||
move_to!(end);
|
||||
}
|
||||
_ => {
|
||||
|
@ -468,7 +474,7 @@ pub(crate) mod printf {
|
|||
match end.next_cp() {
|
||||
Some(('$', end2)) => {
|
||||
state = Prec;
|
||||
width = Some(Num::from_str("", Some(at.slice_between(end).unwrap())));
|
||||
width = Num::from_str("", at.slice_between(end));
|
||||
move_to!(end2);
|
||||
}
|
||||
_ => {
|
||||
|
@ -500,7 +506,7 @@ pub(crate) mod printf {
|
|||
match end.next_cp() {
|
||||
Some(('$', end2)) => {
|
||||
state = Length;
|
||||
precision = Some(Num::from_str("*", next.slice_between(end)));
|
||||
precision = Num::from_str("*", next.slice_between(end));
|
||||
move_to!(end2);
|
||||
}
|
||||
_ => {
|
||||
|
@ -513,7 +519,7 @@ pub(crate) mod printf {
|
|||
'0'..='9' => {
|
||||
let end = at_next_cp_while(next, char::is_ascii_digit);
|
||||
state = Length;
|
||||
precision = Some(Num::from_str(at.slice_between(end).unwrap(), None));
|
||||
precision = at.slice_between(end).and_then(|num| Num::from_str(num, None));
|
||||
move_to!(end);
|
||||
}
|
||||
_ => return fallback(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue