d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Fix some checks on snprintf(3) to prevent miscalculations.

Browse Source 
o This fixes a memory leak that can occur on some URL's.

Pointy hat to:	brian
This commit is contained in:
mike 2001-08-29 23:51:14 +00:00
parent ca93e132a4
commit b093d3a26e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/ftp/util.c
View File

@ -670,16 +670,22 @@ progressmeter(flag)
if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
n = snprintf(buf + len, sizeof(buf) - len,
" --:-- ETA");
if (n > 0 && n < sizeof(buf) - len)
len += n;
} else if (wait.tv_sec >= STALLTIME) {
n = snprintf(buf + len, sizeof(buf) - len,
" - stalled -");
if (n > 0 && n < sizeof(buf) - len)
len += n;
} else {
remaining =
((filesize - restart_point) / (bytes / elapsed) - elapsed);
if (remaining >= 100 * SECSPERHOUR)
if (remaining >= 100 * SECSPERHOUR) {
n = snprintf(buf + len, sizeof(buf) - len,
" --:-- ETA");
else {
if (n > 0 && n < sizeof(buf) - len)
len += n;
} else {
i = remaining / SECSPERHOUR;
if (i)
n = snprintf(buf + len, sizeof(buf) - len,
@ -694,8 +700,6 @@ progressmeter(flag)
"%02d:%02d ETA", i / 60, i % 60);
}
}
if (n > 0 && n < sizeof(buf) - len)
len += n;
(void)write(STDOUT_FILENO, buf, len);
if (flag == -1) {