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

2009-11-13 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* include/grub/multiboot.h (struct grub_multiboot_header): Move
        from here ...
        * include/multiboot.h (struct multiboot_header): ... to here.  Update
        all users.
        * include/grub/multiboot.h (struct grub_multiboot_info): Move
        from here ...
        * include/multiboot.h (struct multiboot_info): ... to here.  Update
        all users.
        * include/grub/multiboot.h (struct grub_multiboot_mmap_entry): Move
        from here ...
        * include/multiboot.h (struct multiboot_mmap_entry): ... to here.
        Update all users.
        * include/grub/multiboot.h (struct grub_mod_list): Move
        from here ...
        * include/multiboot.h (struct multiboot_mod_list): ... to here.
        Update all users.
This commit is contained in:
Robert Millan 2009-11-13 13:34:51 +00:00
parent a73f596946
commit 8d0edf4abd
7 changed files with 147 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
loader/multiboot_loader.c
View file

@ -44,7 +44,7 @@ static unsigned int module_version_status = 1;
static int
find_multi_boot1_header (grub_file_t file)
{
struct grub_multiboot_header *header;
struct multiboot_header *header;
char buffer[MULTIBOOT_SEARCH];
int found_status = 0;
grub_ssize_t len;
@ -55,9 +55,9 @@ find_multi_boot1_header (grub_file_t file)
/* Look for the multiboot header in the buffer. The header should
be at least 12 bytes and aligned on a 4-byte boundary. */
for (header = (struct grub_multiboot_header *) buffer;
for (header = (struct multiboot_header *) buffer;
((char *) header <= buffer + len - 12) || (header = 0);
header = (struct grub_multiboot_header *) ((char *) header + 4))
header = (struct multiboot_header *) ((char *) header + 4))
{
if (header->magic == MULTIBOOT_MAGIC
&& !(header->magic + header->flags + header->checksum))