git: 1fb3caee7224 - main - tail: Do not trust st_size if it equals zero.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Jan 2024 09:01:29 UTC
The branch main has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=1fb3caee72241b9b4dacbfb0109c972a86d4401f
commit 1fb3caee72241b9b4dacbfb0109c972a86d4401f
Author: Ricardo Branco <rbranco@suse.de>
AuthorDate: 2024-01-03 20:32:47 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-01-04 09:00:23 +0000
tail: Do not trust st_size if it equals zero.
PR: bin/276107
MFC after: 1 week
---
usr.bin/tail/forward.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 010a36b4c793..a5303385a74f 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -102,7 +102,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp)
case FBYTES:
if (off == 0)
break;
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size < off)
off = sbp->st_size;
if (fseeko(fp, off, SEEK_SET) == -1) {
@@ -134,7 +134,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp)
}
break;
case RBYTES:
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size >= off &&
fseeko(fp, -off, SEEK_END) == -1) {
ierr(fn);
@@ -151,7 +151,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp)
return;
break;
case RLINES:
- if (S_ISREG(sbp->st_mode))
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0)
if (!off) {
if (fseeko(fp, (off_t)0, SEEK_END) == -1) {
ierr(fn);