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

* grub-core/disk/ldm.c: Rename variables and arguments to prevent

Browse source 
shadowing.
	* grub-core/kern/disk.c: Likewise.
	* grub-core/kern/misc.c: Likewise.
	* include/grub/parser.h: Likewise.
	* include/grub/script_sh.h: Likewise.
	* include/grub/zfs/zfs.h: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-18 16:54:57 +02:00
parent 7b3aca00fa
commit 3cd910a212
7 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
grub-core/disk/ldm.c
View file

@ -707,16 +707,16 @@ make_vg (grub_disk_t disk,
if (comp->segment_alloc == 1)
{
unsigned index;
unsigned node_index;
ptr += *ptr + 1;
if (ptr + *ptr + 1 >= vblk[i].dynamic
+ sizeof (vblk[i].dynamic))
{
goto fail2;
}
index = read_int (ptr + 1, *ptr);
if (index < comp->segments->node_count)
comp->segments->nodes[index] = part;
node_index = read_int (ptr + 1, *ptr);
if (node_index < comp->segments->node_count)
comp->segments->nodes[node_index] = part;
}
else
{