Skip to content

Range checking and miscellaneous fixes tin time library #4466

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 4 commits into from
Jan 23, 2013
Merged

Range checking and miscellaneous fixes tin time library #4466

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca93583
Fix incorrect error messages in the time library
ScriptDevil Jan 13, 2013
406d2b3
Fix errors in how parsed time values were used
ScriptDevil Jan 13, 2013
a157f1d
Add range checking in the time library
ScriptDevil Jan 13, 2013
e69d491
Tidied up long lines
ScriptDevil Jan 14, 2013
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
67 changes: 34 additions & 33 deletions src/libstd/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,16 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
Some((value, pos))
}

fn match_digits_in_range(ss: &str, pos: uint, digits: uint, ws: bool,
min: i32, max: i32) -> Option<(i32, uint)> {
match match_digits(ss, pos, digits, ws) {
Some((val, pos)) if val >= min && val <= max => {
Some((val, pos))
}
_ => None
}
}

fn parse_char(s: &str, pos: uint, c: char) -> Result<uint, ~str> {
let range = str::char_range_at(s, pos);

Expand Down Expand Up @@ -393,7 +403,8 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
Some(item) => { let (v, pos) = item; tm.tm_mon = v; Ok(pos) }
None => Err(~"Invalid month")
},
'C' => match match_digits(s, pos, 2u, false) {
'C' => match match_digits_in_range(s, pos, 2u, false, 0_i32,
99_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_year += (v * 100_i32) - 1900_i32;
Expand All @@ -419,11 +430,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
.chain(|pos| parse_char(s, pos, '/'))
.chain(|pos| parse_type(s, pos, 'y', tm))
}
'd' => match match_digits(s, pos, 2u, false) {
'd' => match match_digits_in_range(s, pos, 2u, false, 1_i32,
31_i32) {
Some(item) => { let (v, pos) = item; tm.tm_mday = v; Ok(pos) }
None => Err(~"Invalid day of the month")
},
'e' => match match_digits(s, pos, 2u, true) {
'e' => match match_digits_in_range(s, pos, 2u, true, 1_i32,
31_i32) {
Some(item) => { let (v, pos) = item; tm.tm_mday = v; Ok(pos) }
None => Err(~"Invalid day of the month")
},
Expand All @@ -435,15 +448,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
.chain(|pos| parse_type(s, pos, 'd', tm))
}
'H' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 0_i32, 23_i32) {
Some(item) => { let (v, pos) = item; tm.tm_hour = v; Ok(pos) }
None => Err(~"Invalid hour")
}
}
'I' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 1_i32, 12_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_hour = if v == 12_i32 { 0_i32 } else { v };
Expand All @@ -453,26 +464,23 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
}
'j' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 3u, false) {
match match_digits_in_range(s, pos, 3u, false, 1_i32, 366_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_yday = v - 1_i32;
Ok(pos)
}
None => Err(~"Invalid year")
None => Err(~"Invalid day of year")
}
}
'k' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, true) {
match match_digits_in_range(s, pos, 2u, true, 0_i32, 23_i32) {
Some(item) => { let (v, pos) = item; tm.tm_hour = v; Ok(pos) }
None => Err(~"Invalid hour")
}
}
'l' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, true) {
match match_digits_in_range(s, pos, 2u, true, 1_i32, 12_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_hour = if v == 12_i32 { 0_i32 } else { v };
Expand All @@ -482,15 +490,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
}
'M' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 0_i32, 59_i32) {
Some(item) => { let (v, pos) = item; tm.tm_min = v; Ok(pos) }
None => Err(~"Invalid minute")
}
}
'm' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 1_i32, 12_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_mon = v - 1_i32;
Expand Down Expand Up @@ -527,8 +533,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
.chain(|pos| parse_type(s, pos, 'p', tm))
}
'S' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 0_i32, 60_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_sec = v;
Expand All @@ -547,14 +552,13 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
't' => parse_char(s, pos, '\t'),
'u' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 1u, false) {
match match_digits_in_range(s, pos, 1u, false, 1_i32, 7_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_wday = v;
tm.tm_wday = v-1_i32;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid day of week")
}
}
'v' => {
Expand All @@ -566,34 +570,31 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
}
//'W' {}
'w' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 1u, false) {
match match_digits_in_range(s, pos, 1u, false, 0_i32, 6_i32) {
Some(item) => { let (v, pos) = item; tm.tm_wday = v; Ok(pos) }
None => Err(~"Invalid weekday")
None => Err(~"Invalid day of week")
}
}
//'X' {}
//'x' {}
'Y' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 4u, false) {
Some(item) => {
let (v, pos) = item;
tm.tm_year = v - 1900_i32;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid year")
}
}
'y' => {
// FIXME (#2350): range check.
match match_digits(s, pos, 2u, false) {
match match_digits_in_range(s, pos, 2u, false, 0_i32, 99_i32) {
Some(item) => {
let (v, pos) = item;
tm.tm_year = v - 1900_i32;
tm.tm_year = v;
Ok(pos)
}
None => Err(~"Invalid weekday")
None => Err(~"Invalid year")
}
}
'Z' => {
Expand Down