From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 17 Jan 2014 08:10:43 +0000 (+0200)
Subject: Prevent integer overflow with --progress >= 2148
X-Git-Tag: REL9_4_BETA1~670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=277279981fba7646d0f05a664d58b845d2fdf69d;p=postgresql

Prevent integer overflow with --progress >= 2148

If --progress=2148 or higher was given, the calculation of the next time
to report overflowed, and pgbench would print a progress report very
frequently.

Kingter Wang
---

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 8f12583096..16b7ab5ddc 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -2974,7 +2974,7 @@ threadRun(void *arg)
 	/* for reporting progress: */
 	int64       thread_start = INSTR_TIME_GET_MICROSEC(thread->start_time);
 	int64		last_report = thread_start;
-	int64		next_report = last_report + progress * 1000000;
+	int64		next_report = last_report + (int64) progress * 1000000;
 	int64		last_count = 0, last_lats = 0, last_sqlats = 0, last_lags = 0;
 
 	AggVals		aggs;
@@ -3210,7 +3210,7 @@ threadRun(void *arg)
 				last_sqlats = sqlats;
 				last_lags = lags;
 				last_report = now;
-				next_report += progress * 1000000;
+				next_report += (int64) progress * 1000000;
 			}
 		}
 #else
@@ -3261,7 +3261,7 @@ threadRun(void *arg)
 				last_sqlats = sqlats;
 				last_lags = lags;
 				last_report = now;
-				next_report += progress * 1000000;
+				next_report += (int64) progress * 1000000;
 			}
 		}
 #endif /* PTHREAD_FORK_EMULATION */