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

* util/grub-setup.c (setup): Handle some corner cases.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-04 08:55:06 +02:00
parent be00894104
commit c962563095
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-04 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-setup.c (setup): Handle some corner cases.
2013-04-04 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/posix_wrap/locale.h [GRUB_UTIL]: Include host locale.h. * grub-core/lib/posix_wrap/locale.h [GRUB_UTIL]: Include host locale.h.

8
util/grub-setup.c
View file

@ -256,7 +256,7 @@ setup (const char *dir,
grub_device_t root_dev = 0, dest_dev, core_dev; grub_device_t root_dev = 0, dest_dev, core_dev;
struct blocklists bl; struct blocklists bl;
char *tmp_img; char *tmp_img;
grub_disk_addr_t first_sector; grub_disk_addr_t first_sector = (grub_disk_addr_t)-1;
FILE *fp; FILE *fp;
#ifdef GRUB_SETUP_BIOS #ifdef GRUB_SETUP_BIOS
@ -756,6 +756,8 @@ unable_to_embed:
grub_util_error ("%s", _("blocksize is not divisible by 512")); grub_util_error ("%s", _("blocksize is not divisible by 512"));
mul = bsize >> GRUB_DISK_SECTOR_BITS; mul = bsize >> GRUB_DISK_SECTOR_BITS;
nblocks = (core_size + bsize - 1) / bsize; nblocks = (core_size + bsize - 1) / bsize;
if (mul == 0 || nblocks == 0)
grub_util_error ("%s", _("can't retrieve blocklists"));
for (i = 0; i < nblocks; i++) for (i = 0; i < nblocks; i++)
{ {
unsigned blk = i; unsigned blk = i;
@ -808,7 +810,7 @@ unable_to_embed:
- j * GRUB_DISK_SECTOR_SIZE); - j * GRUB_DISK_SECTOR_SIZE);
if (len > GRUB_DISK_SECTOR_SIZE) if (len > GRUB_DISK_SECTOR_SIZE)
len = GRUB_DISK_SECTOR_SIZE; len = GRUB_DISK_SECTOR_SIZE;
if (i == 0 && j == 0) if (first_sector == (grub_disk_addr_t)-1)
save_first_sector ((fie2->fm_extents[i].fe_physical save_first_sector ((fie2->fm_extents[i].fe_physical
>> GRUB_DISK_SECTOR_BITS) >> GRUB_DISK_SECTOR_BITS)
+ j + container_start, + j + container_start,
@ -825,6 +827,8 @@ unable_to_embed:
} }
} }
if (first_sector == (grub_disk_addr_t)-1)
grub_util_error ("%s", _("can't retrieve blocklists"));
} }
fclose (fp); fclose (fp);
} }