Skip to content

Add checks to prevent overflow when normalizing Timestamp/Duration nanos. #24146

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

Closed
wants to merge 1 commit into from
+14 −2
Closed

Add checks to prevent overflow when normalizing Timestamp/Duration nanos. #24146

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
16 changes: 14 additions & 2 deletions src/google/protobuf/util/time_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@ Timestamp CreateNormalized(int64_t seconds, int32_t nanos) {

// Make sure nanos is in the range.
if (nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
seconds += nanos / kNanosPerSecond;
int64_t seconds_offset = nanos / kNanosPerSecond;
ABSL_DCHECK(!((seconds_offset > 0 &&
seconds > TimeUtil::kTimestampMaxSeconds - seconds_offset) ||
(seconds_offset < 0 &&
seconds < TimeUtil::kTimestampMinSeconds - seconds_offset)))
<< "Timestamp seconds overflow when normalizing nanos.";
seconds += seconds_offset;
nanos = nanos % kNanosPerSecond;
}
// For Timestamp nanos should be in the range [0, 999999999]
Expand Down Expand Up @@ -80,7 +86,13 @@ Duration CreateNormalized(int64_t seconds, int32_t nanos) {

// Make sure nanos is in the range.
if (nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
seconds += nanos / kNanosPerSecond;
int64_t seconds_offset = nanos / kNanosPerSecond;
ABSL_DCHECK(!((seconds_offset > 0 &&
seconds > TimeUtil::kDurationMaxSeconds - seconds_offset) ||
(seconds_offset < 0 &&
seconds < TimeUtil::kDurationMinSeconds - seconds_offset)))
<< "Duration seconds overflow when normalizing nanos.";
seconds += seconds_offset;
nanos = nanos % kNanosPerSecond;
}
// nanos should have the same sign as seconds.
Expand Down
Loading