itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-10-02 07:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard against overflow in NaiveDate::with_*0 methods

Browse Source
This commit is contained in:
Paul Dicker 2023-04-18 07:50:26 +02:00 committed by Dirkjan Ochtman
parent e51430f3e1
commit c83f32e6ba
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/naive/date.rs
View File

@ -1559,7 +1559,8 @@ impl Datelike for NaiveDate {
/// ``` /// ```
#[inline] #[inline]
fn with_month0(&self, month0: u32) -> Option<NaiveDate> { fn with_month0(&self, month0: u32) -> Option<NaiveDate> {
self.with_mdf(self.mdf().with_month(month0 + 1)?) let month = month0.checked_add(1)?;
self.with_mdf(self.mdf().with_month(month)?)
} }
/// Makes a new `NaiveDate` with the day of month (starting from 1) changed. /// Makes a new `NaiveDate` with the day of month (starting from 1) changed.
@ -1597,7 +1598,8 @@ impl Datelike for NaiveDate {
/// ``` /// ```
#[inline] #[inline]
fn with_day0(&self, day0: u32) -> Option<NaiveDate> { fn with_day0(&self, day0: u32) -> Option<NaiveDate> {
self.with_mdf(self.mdf().with_day(day0 + 1)?) let day = day0.checked_add(1)?;
self.with_mdf(self.mdf().with_day(day)?)
} }
/// Makes a new `NaiveDate` with the day of year (starting from 1) changed. /// Makes a new `NaiveDate` with the day of year (starting from 1) changed.
@ -1645,7 +1647,8 @@ impl Datelike for NaiveDate {
/// ``` /// ```
#[inline] #[inline]
fn with_ordinal0(&self, ordinal0: u32) -> Option<NaiveDate> { fn with_ordinal0(&self, ordinal0: u32) -> Option<NaiveDate> {
self.with_of(self.of().with_ordinal(ordinal0 + 1)?) let ordinal = ordinal0.checked_add(1)?;
self.with_of(self.of().with_ordinal(ordinal)?)
} }
} }
@ -3032,4 +3035,12 @@ mod tests {
} }
} }
} }
#[test]
fn test_with_0_overflow() {
let dt = NaiveDate::from_ymd_opt(2023, 4, 18).unwrap();
assert!(dt.with_month0(4294967295).is_none());
assert!(dt.with_day0(4294967295).is_none());
assert!(dt.with_ordinal0(4294967295).is_none());
}
} }