From 1e50f440fcf5ff97421dea4414adbd51c1851eab Mon Sep 17 00:00:00 2001 From: bde Date: Sat, 15 Mar 1997 16:49:51 +0000 Subject: [PATCH] Don't attempt to read past EOF. Saved enough bytes to make room for this bloat (testing poff < inode.i_size takes 56 bytes!) by copying fs to a local variable. --- sys/i386/boot/biosboot/sys.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c index 4ac397838069..2ad469455d1c 100644 --- a/sys/i386/boot/biosboot/sys.c +++ b/sys/i386/boot/biosboot/sys.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $Id$ + * $Id: sys.c,v 1.18 1997/02/22 09:30:14 peter Exp $ */ #include "boot.h" @@ -73,12 +73,14 @@ read(char *buffer, int count) { int logno, off, size; int cnt2, bnum2; + struct fs *fs_copy; - while (count) { - off = blkoff(fs, poff); - logno = lblkno(fs, poff); - cnt2 = size = blksize(fs, &inode, logno); - bnum2 = fsbtodb(fs, block_map(logno)) + boff; + while (count > 0 && poff < inode.i_size) { + fs_copy = fs; + off = blkoff(fs_copy, poff); + logno = lblkno(fs_copy, poff); + cnt2 = size = blksize(fs_copy, &inode, logno); + bnum2 = fsbtodb(fs_copy, block_map(logno)) + boff; if ( (!off) && (size <= count)) { devread(buffer, bnum2, cnt2); } else {