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

Fix error checking tm_mon in time::Tm conversion

Browse source 
Fixes #128
This commit is contained in:
Mathijs van de Nes 2020-01-06 22:27:46 +01:00
parent 003440bfe3
commit a85e3eb809
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/types.rs
View file

@ -111,7 +111,7 @@ impl DateTime {
/// Returns `Err` when this object is out of bounds /// Returns `Err` when this object is out of bounds
pub fn from_time(tm: ::time::Tm) -> Result<DateTime, ()> { pub fn from_time(tm: ::time::Tm) -> Result<DateTime, ()> {
if tm.tm_year >= 80 && tm.tm_year <= 207 if tm.tm_year >= 80 && tm.tm_year <= 207
&& tm.tm_mon >= 1 && tm.tm_mon <= 31 && tm.tm_mon >= 0 && tm.tm_mon <= 11
&& tm.tm_mday >= 1 && tm.tm_mday <= 31 && tm.tm_mday >= 1 && tm.tm_mday <= 31
&& tm.tm_hour >= 0 && tm.tm_hour <= 23 && tm.tm_hour >= 0 && tm.tm_hour <= 23
&& tm.tm_min >= 0 && tm.tm_min <= 59 && tm.tm_min >= 0 && tm.tm_min <= 59
@ -373,4 +373,15 @@ mod test {
#[cfg(feature = "time")] #[cfg(feature = "time")]
assert_eq!(format!("{}", dt.to_time().rfc3339()), "1980-00-00T00:00:00Z"); assert_eq!(format!("{}", dt.to_time().rfc3339()), "1980-00-00T00:00:00Z");
} }
#[cfg(feature = "time")]
#[test]
fn time_at_january() {
use super::DateTime;
// 2020-01-01 00:00:00
let clock = ::time::Timespec::new(1577836800, 0);
let tm = ::time::at_utc(clock);
assert!(DateTime::from_time(tm).is_ok());
}
} }