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

btrfs: avoid "used uninitialized" error with GCC7

Browse source 
sblock was local and so considered new variable on every loop
iteration.

Closes: 50597
This commit is contained in:
Andrei Borzenkov 2017-04-04 19:22:32 +03:00
parent ec4af117c6
commit 6cef7f6079
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/fs/btrfs.c
View file

@ -227,11 +227,11 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data,
static grub_err_t static grub_err_t
read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb) read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
{ {
struct grub_btrfs_superblock sblock;
unsigned i; unsigned i;
grub_err_t err = GRUB_ERR_NONE; grub_err_t err = GRUB_ERR_NONE;
for (i = 0; i < ARRAY_SIZE (superblock_sectors); i++) for (i = 0; i < ARRAY_SIZE (superblock_sectors); i++)
{ {
struct grub_btrfs_superblock sblock;
/* Don't try additional superblocks beyond device size. */ /* Don't try additional superblocks beyond device size. */
if (i && (grub_le_to_cpu64 (sblock.this_device.size) if (i && (grub_le_to_cpu64 (sblock.this_device.size)
>> GRUB_DISK_SECTOR_BITS) <= superblock_sectors[i]) >> GRUB_DISK_SECTOR_BITS) <= superblock_sectors[i])