Fix DurationToMilliseconds mult overflow

protobuf-github-bot · copybara-github · commit 17b8dd6476cf · 2023-12-06T09:00:48.000-08:00
PiperOrigin-RevId: 588443477
diff --git a/src/google/protobuf/util/time_util.cc b/src/google/protobuf/util/time_util.cc
@@ -311,11 +311,13 @@ int64_t TimeUtil::DurationToNanoseconds(const Duration& duration) {
 }
 
 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) {
diff --git a/src/google/protobuf/util/time_util_test.cc b/src/google/protobuf/util/time_util_test.cc
@@ -145,6 +145,12 @@ TEST(TimeUtilTest, DurationIntegerConversion) {
       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)));

Original file line number	Diff line number	Diff line change
`@@ -311,11 +311,13 @@ int64_t TimeUtil::DurationToNanoseconds(const Duration& duration) {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`int64_t TimeUtil::DurationToMicroseconds(const Duration& duration) {`
`314`		`- return RoundTowardZero(DurationToNanoseconds(duration), kNanosPerMicrosecond);`
	`314`	`+ return DurationToSeconds(duration) * kMicrosPerSecond +`
	`315`	`+ RoundTowardZero(duration.nanos(), kNanosPerMicrosecond);`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`int64_t TimeUtil::DurationToMilliseconds(const Duration& duration) {`
`318`		`- return RoundTowardZero(DurationToNanoseconds(duration), kNanosPerMillisecond);`
	`319`	`+ return DurationToSeconds(duration) * kMillisPerSecond +`
	`320`	`+ RoundTowardZero(duration.nanos(), kNanosPerMillisecond);`
`319`	`321`	`}`
`320`	`322`
`321`	`323`	`int64_t TimeUtil::DurationToSeconds(const Duration& duration) {`