commit 17b8dd6476cf663517393fd866e888af2494bdb2
author Protobuf Team Bot <protobuf-github-bot@google.com> Wed Dec 06 08:59:01 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Dec 06 09:00:48 2023 -0800
tree 66845b17481839735ccfd33e9da2f5b1276d5e9b
parent 43e7e52b28abae58975a591bdc27dcde15569241

Fix DurationToMilliseconds mult overflow

PiperOrigin-RevId: 588443477

src/google/protobuf/util/time_util.cc

diff --git a/src/google/protobuf/util/time_util.cc b/src/google/protobuf/util/time_util.cc
index e27b0d1..2d62eca 100644
--- a/src/google/protobuf/util/time_util.cc
+++ b/src/google/protobuf/util/time_util.cc
@@ -311,11 +311,13 @@
 }
 
 int64_t TimeUtil::DurationToMicroseconds(const Duration& duration) {
-  return RoundTowardZero(DurationToNanoseconds(duration), kNanosPerMicrosecond);
+  return DurationToSeconds(duration) * kMicrosPerSecond +
+         RoundTowardZero(duration.nanos(), kNanosPerMicrosecond);
 }
 
 int64_t TimeUtil::DurationToMilliseconds(const Duration& duration) {
-  return RoundTowardZero(DurationToNanoseconds(duration), kNanosPerMillisecond);
+  return DurationToSeconds(duration) * kMillisPerSecond +
+         RoundTowardZero(duration.nanos(), kNanosPerMillisecond);
 }
 
 int64_t TimeUtil::DurationToSeconds(const Duration& duration) {

src/google/protobuf/util/time_util_test.cc

diff --git a/src/google/protobuf/util/time_util_test.cc b/src/google/protobuf/util/time_util_test.cc
index 0892eea..98a643e 100644
--- a/src/google/protobuf/util/time_util_test.cc
+++ b/src/google/protobuf/util/time_util_test.cc
@@ -145,6 +145,12 @@
       1, TimeUtil::DurationToMilliseconds(TimeUtil::MillisecondsToDuration(1)));
   EXPECT_EQ(-1, TimeUtil::DurationToMilliseconds(
                     TimeUtil::MillisecondsToDuration(-1)));
+  // Test overflow issue
+  EXPECT_EQ(315576000000000, TimeUtil::DurationToMilliseconds(
+                                 TimeUtil::SecondsToDuration(315576000000)));
+  // Test overflow issue
+  EXPECT_EQ(315576000000000000, TimeUtil::DurationToMicroseconds(
+                                    TimeUtil::SecondsToDuration(315576000000)));
   EXPECT_EQ(1, TimeUtil::DurationToSeconds(TimeUtil::SecondsToDuration(1)));
   EXPECT_EQ(-1, TimeUtil::DurationToSeconds(TimeUtil::SecondsToDuration(-1)));
   EXPECT_EQ(1, TimeUtil::DurationToMinutes(TimeUtil::MinutesToDuration(1)));