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

Merge pull request #6 from coreos/gnu

Browse source 
Merge upstream GRUB changes
This commit is contained in:
Michael Marineau 2014-11-23 17:58:18 -07:00
commit b97f2fa47e
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
grub-core/kern/efi/init.c
View file

@ -63,10 +63,13 @@ grub_machine_get_bootlocation (char **device, char **path)
if (!*device && grub_efi_net_config)
grub_efi_net_config (image->device_handle, device, path);
/* Get the directory. */
p = grub_strrchr (*path, '/');
if (p)
*p = '\0';
if (*path)
{
/* Get the directory. */
p = grub_strrchr (*path, '/');
if (p)
*p = '\0';
}
}
void

2
grub-core/net/icmp6.c
View file

@ -205,7 +205,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
if (ttl != 0xff)
break;
nbh = (struct neighbour_solicit *) nb->data;
err = grub_netbuff_pull (nb, sizeof (struct router_adv));
err = grub_netbuff_pull (nb, sizeof (*nbh));
if (err)
{
grub_netbuff_free (nb);