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

rlines() checks:

Browse Source 
1) really check for size overflow by checking negative value.
2) since mmap() not support files over INT_MAX size, add check for it
until either mmap() will be fixed or tail will be rewritted to handle
large files alternatively.
3) replace fseek(... file_size, SEEK_SET) with fseek(... 0L, SEEK_END)
to avoid off_t -> long cast
4) Use exit() if file is too big instead of warning and wrong logic
afterwards.
This commit is contained in:
Andrey A. Chernov 2001-03-26 19:29:49 +00:00
parent 5a17403d43
commit 4f2554b7b7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=74827
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/tail/forward.c
View File

@ -274,10 +274,17 @@ rlines(fp, off, sbp)
if (!(size = sbp->st_size))
return;
if (size > SIZE_T_MAX) {
if (size > SIZE_T_MAX || size < 0) {
errno = EFBIG;
ierr();
return;
exit(1);
}
/* XXX: FIXME - mmap() not support files over 2Gb */
if (size > INT_MAX) {
errno = EFBIG;
ierr();
exit(1);
}
if ((start = mmap(NULL, (size_t)size,
@ -296,7 +303,7 @@ rlines(fp, off, sbp)
/* Set the file pointer to reflect the length displayed. */
size = sbp->st_size - size;
WR(p, size);
if (fseek(fp, (long)sbp->st_size, SEEK_SET) == -1) {
if (fseek(fp, 0L, SEEK_END) == -1) {
ierr();
return;
}