Skip to content

Fix panic when deserializing Duration #4172

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

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Fix panic when deserializing Duration #4172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion lightning/src/util/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,14 @@ impl Readable for Duration {
fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
let secs = Readable::read(r)?;
let nanos = Readable::read(r)?;
Ok(Duration::new(secs, nanos))
// Duration::new panics if the nanosecond part in excess of a second, added to the second
// part, overflows. To ensure this won't happen, we simply reject any case where there are
// nanoseconds in excess of a second, which is invalid anyway.
if nanos >= 1_000_000_000 {
Err(DecodeError::InvalidValue)
} else {
Ok(Duration::new(secs, nanos))
}
}
}

Expand Down
Loading