mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Merge pull request #4959 from bjoroen/report_overflow_error

Browse Source 
Report overflow error
This commit is contained in:
Jeong, YunWon
2023-05-11 17:13:34 +09:00
committed by GitHub
parent f3e4d34092 fa30d33c9b
commit 833371918d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vm/src/stdlib/time.rs
View File

@@ -350,7 +350,10 @@ mod time {
}
fn to_date_time(&self, vm: &VirtualMachine) -> PyResult<NaiveDateTime> {
let invalid = || vm.new_value_error("invalid struct_time parameter".to_owned());
let invalid_overflow =
|| vm.new_overflow_error("mktime argument out of range".to_owned());
let invalid_value = || vm.new_value_error("invalid struct_time parameter".to_owned());
macro_rules! field {
($field:ident) => {
self.$field.clone().try_into_value(vm)?
@@ -358,9 +361,9 @@ mod time {
}
let dt = NaiveDateTime::new(
NaiveDate::from_ymd_opt(field!(tm_year), field!(tm_mon), field!(tm_mday))
.ok_or_else(invalid)?,
.ok_or_else(invalid_value)?,
NaiveTime::from_hms_opt(field!(tm_hour), field!(tm_min), field!(tm_sec))
.ok_or_else(invalid)?,
.ok_or_else(invalid_overflow)?,
);
Ok(dt)
}