DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Change maximum seconds for DateTime

Browse source 
The valid range of values for the seconds of the MS-DOS date and time
is 0 to 58. So, change `DateTime` to not accept after 58 seconds.
This commit is contained in:
Shun Sakai 2024-05-28 15:00:13 +09:00
parent 178a235921
commit 83eccdf3e2
No known key found for this signature in database
GPG key ID: 36ED1E6026DC1056
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/types.rs
View file

@ -112,7 +112,7 @@ impl arbitrary::Arbitrary<'_> for DateTime {
day: u.int_in_range(1..=31)?, day: u.int_in_range(1..=31)?,
hour: u.int_in_range(0..=23)?, hour: u.int_in_range(0..=23)?,
minute: u.int_in_range(0..=59)?, minute: u.int_in_range(0..=59)?,
second: u.int_in_range(0..=60)?, second: u.int_in_range(0..=58)?,
}) })
} }
} }
@ -238,7 +238,7 @@ impl DateTime {
/// * day: [1, 31] /// * day: [1, 31]
/// * hour: [0, 23] /// * hour: [0, 23]
/// * minute: [0, 59] /// * minute: [0, 59]
/// * second: [0, 60] /// * second: [0, 58]
pub fn from_date_and_time( pub fn from_date_and_time(
year: u16, year: u16,
month: u8, month: u8,
@ -252,7 +252,7 @@ impl DateTime {
&& (1..=31).contains(&day) && (1..=31).contains(&day)
&& hour <= 23 && hour <= 23
&& minute <= 59 && minute <= 59
&& second <= 60 && second <= 58
{ {
Ok(DateTime { Ok(DateTime {
year, year,
@ -1093,8 +1093,8 @@ mod test {
#[allow(clippy::unusual_byte_groupings)] #[allow(clippy::unusual_byte_groupings)]
fn datetime_max() { fn datetime_max() {
use super::DateTime; use super::DateTime;
let dt = DateTime::from_date_and_time(2107, 12, 31, 23, 59, 60).unwrap(); let dt = DateTime::from_date_and_time(2107, 12, 31, 23, 59, 58).unwrap();
assert_eq!(dt.timepart(), 0b10111_111011_11110); assert_eq!(dt.timepart(), 0b10111_111011_11101);
assert_eq!(dt.datepart(), 0b1111111_1100_11111); assert_eq!(dt.datepart(), 0b1111111_1100_11111);
} }
@ -1156,9 +1156,9 @@ mod test {
assert_eq!( assert_eq!(
format!( format!(
"{}", "{}",
DateTime::from_date_and_time(2107, 12, 31, 23, 59, 59).unwrap() DateTime::from_date_and_time(2107, 12, 31, 23, 59, 58).unwrap()
), ),
"2107-12-31 23:59:59" "2107-12-31 23:59:58"
); );
} }
@ -1166,10 +1166,10 @@ mod test {
fn datetime_bounds() { fn datetime_bounds() {
use super::DateTime; use super::DateTime;
assert!(DateTime::from_date_and_time(2000, 1, 1, 23, 59, 60).is_ok()); assert!(DateTime::from_date_and_time(2000, 1, 1, 23, 59, 58).is_ok());
assert!(DateTime::from_date_and_time(2000, 1, 1, 24, 0, 0).is_err()); assert!(DateTime::from_date_and_time(2000, 1, 1, 24, 0, 0).is_err());
assert!(DateTime::from_date_and_time(2000, 1, 1, 0, 60, 0).is_err()); assert!(DateTime::from_date_and_time(2000, 1, 1, 0, 60, 0).is_err());
assert!(DateTime::from_date_and_time(2000, 1, 1, 0, 0, 61).is_err()); assert!(DateTime::from_date_and_time(2000, 1, 1, 0, 0, 59).is_err());
assert!(DateTime::from_date_and_time(2107, 12, 31, 0, 0, 0).is_ok()); assert!(DateTime::from_date_and_time(2107, 12, 31, 0, 0, 0).is_ok());
assert!(DateTime::from_date_and_time(1980, 1, 1, 0, 0, 0).is_ok()); assert!(DateTime::from_date_and_time(1980, 1, 1, 0, 0, 0).is_ok());