github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-09 17:20:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/progress.c (print_row_stats): Fix two integer overflows

Browse Source
This commit is contained in:
Tim Rühsen 2019-12-12 16:14:57 +01:00
parent bc7e82d3e9
commit e2c0c2fbe5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/progress.c
View File

@ -303,6 +303,9 @@ print_row_stats (struct dot_progress *dp, double dltime, bool last)
/* For last row also count bytes accumulated after last dot */ /* For last row also count bytes accumulated after last dot */
bytes_displayed += dp->accumulated; bytes_displayed += dp->accumulated;
if (bytes_displayed < 0)
bytes_displayed = 0;
if (dp->total_length) if (dp->total_length)
{ {
/* Round to floor value to provide gauge how much data *has* /* Round to floor value to provide gauge how much data *has*
@ -338,9 +341,9 @@ print_row_stats (struct dot_progress *dp, double dltime, bool last)
Belperchinov-Shabanski's "wget-new-percentage" patch. */ Belperchinov-Shabanski's "wget-new-percentage" patch. */
if (dp->total_length) if (dp->total_length)
{ {
wgint bytes_remaining = dp->total_length - bytes_displayed; wgint bytes_remaining = dp->total_length > bytes_displayed ? dp->total_length - bytes_displayed : 0;
/* The quantity downloaded in this download run. */ /* The quantity downloaded in this download run. */
wgint bytes_sofar = bytes_displayed - dp->initial_length; wgint bytes_sofar = bytes_displayed > dp->initial_length ? bytes_displayed - dp->initial_length : 1;
double eta = dltime * bytes_remaining / bytes_sofar; double eta = dltime * bytes_remaining / bytes_sofar;
if (eta < 0) if (eta < 0)
eta = 0; eta = 0;