ping: avoid interger overflow [lgtm scan]

Convert int types to long before multiplicatio. Notice that ntokens that is used to store the value is already long. Reference: https://lgtm.com/projects/g/iputils/iputils/?mode=list Signed-off-by: Sami Kerola <[email protected]>
Mingli-Yu · Nov 19, 2019 · 1b5da2d · 1b5da2d
1 parent 91c83d9
commit 1b5da2d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ping/ping_common.c b/ping/ping_common.c
@@ -316,7 +316,7 @@ int pinger(struct ping_rts *rts, ping_func_set_st *fset, socket_st *sock)
 		gettimeofday(&rts->cur_time, NULL);
 		tokens = rts->interval * (rts->preload - 1);
 	} else {
-		long ntokens;
+		long ntokens, tmp;
 		struct timeval tv;
 
 		gettimeofday(&tv, NULL);
@@ -329,8 +329,9 @@ int pinger(struct ping_rts *rts, ping_func_set_st *fset, socket_st *sock)
 				return MININTERVAL - ntokens;
 		}
 		ntokens += tokens;
-		if (ntokens > rts->interval * rts->preload)
-			ntokens = rts->interval * rts->preload;
+		tmp = (long)rts->interval * (long)rts->preload;
+		if (tmp < ntokens)
+			ntokens = tmp;
 		if (ntokens < rts->interval)
 			return rts->interval - ntokens;