Skip to content
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

Properly handle NaN in new Date() #1477

Merged
merged 2 commits into from
Aug 20, 2021
Merged

Properly handle NaN in new Date() #1477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2771c97
Properly handle `NaN` in `new Date()`
raskad Aug 17, 2021
e25ee2c
Use default date in `Date.prototype.setFullYear()` if the date is inv…
raskad Aug 17, 2021
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
17 changes: 14 additions & 3 deletions boa/src/builtins/date/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,13 @@ impl Date {
},
tv => {
let tv = tv.to_number(context)?;
let secs = (tv / 1_000f64) as i64;
let nsecs = ((tv % 1_000f64) * 1_000_000f64) as u32;
NaiveDateTime::from_timestamp_opt(secs, nsecs)
if tv.is_nan() {
None
} else {
let secs = (tv / 1_000f64) as i64;
let nsecs = ((tv % 1_000f64) * 1_000_000f64) as u32;
NaiveDateTime::from_timestamp_opt(secs, nsecs)
}
}
},
};
Expand Down Expand Up @@ -846,6 +850,13 @@ impl Date {
/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setFullYear
pub fn set_full_year(&mut self, year: Option<f64>, month: Option<f64>, day: Option<f64>) {
if let Some(year) = year {
if self.0.is_none() {
self.0 = NaiveDateTime::from_timestamp_opt(0, 0)
.and_then(|local| ignore_ambiguity(Local.from_local_datetime(&local)))
.map(|local| local.naive_utc())
.filter(|time| Self::time_clip(time.timestamp_millis() as f64).is_some());
}

self.set_components(false, Some(year), month, day, None, None, None, None)
} else {
self.0 = None
Expand Down