vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2005-10-15 Marco Gerards <mgerards@xs4all.nl>

Browse source 
* fs/xfs.c (grub_xfs_iterate_dir): Detect an error if part of a
	directory can not be read.
This commit is contained in:
marco_g 2005-10-15 21:33:38 +00:00
parent 4801580bfa
commit 6fa1251a91
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-10-15 Marco Gerards <mgerards@xs4all.nl>
* fs/xfs.c (grub_xfs_iterate_dir): Detect an error if part of a
directory can not be read.
2005-10-15 Yoshinori K. Okuji <okuji@enbug.org> 2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* configure.ac (AC_INIT): Increase the version number to 1.91. * configure.ac (AC_INIT): Increase the version number to 1.91.

4
conf/i386-pc.mk
View file

@ -728,8 +728,8 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
commands/timeout.c \ commands/timeout.c \
commands/i386/pc/halt.c commands/i386/pc/reboot.c \ commands/i386/pc/halt.c commands/i386/pc/reboot.c \
disk/loopback.c \ disk/loopback.c \
fs/affs.c fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c \ fs/affs.c fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c \
fs/iso9660.c fs/jfs.c fs/minix.c fs/sfs.c fs/ufs.c fs/xfs.c \ fs/jfs.c fs/minix.c fs/sfs.c fs/ufs.c fs/xfs.c \
io/gzio.c \ io/gzio.c \
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \ kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \

2
fs/xfs.c
View file

@ -418,6 +418,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
numread = grub_xfs_read_file (dir, 0, numread = grub_xfs_read_file (dir, 0,
blk << dir->data->sblock.log2_bsize, blk << dir->data->sblock.log2_bsize,
dir->data->bsize, dirblock); dir->data->bsize, dirblock);
if (numread != dir->data->bsize)
return 0;
entries = (grub_be_to_cpu32 (tail->leaf_count) entries = (grub_be_to_cpu32 (tail->leaf_count)
- grub_be_to_cpu32 (tail->leaf_stale)); - grub_be_to_cpu32 (tail->leaf_stale));