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

* grub-core/loader/i386/bsd.c: Remove variable length arrays.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-20 23:45:43 +02:00
parent 2a40badf82
commit 2e4659b810
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/bsd.c: Remove variable length arrays.
2013-10-20 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/ufs.c: Remove variable length arrays. * grub-core/fs/ufs.c: Remove variable length arrays.

31
grub-core/loader/i386/bsd.c
View file

@ -216,8 +216,8 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
grub_device_close (dev); grub_device_close (dev);
} }
grub_err_t static grub_err_t
grub_bsd_add_meta (grub_uint32_t type, const void *data, grub_uint32_t len) grub_bsd_add_meta_ptr (grub_uint32_t type, void **ptr, grub_uint32_t len)
{ {
struct bsd_tag *newtag; struct bsd_tag *newtag;
@ -227,8 +227,7 @@ grub_bsd_add_meta (grub_uint32_t type, const void *data, grub_uint32_t len)
newtag->len = len; newtag->len = len;
newtag->type = type; newtag->type = type;
newtag->next = NULL; newtag->next = NULL;
if (len) *ptr = newtag->data;
grub_memcpy (newtag->data, data, len);
if (kernel_type == KERNEL_TYPE_FREEBSD if (kernel_type == KERNEL_TYPE_FREEBSD
&& type == (FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_SMAP)) && type == (FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_SMAP))
@ -257,6 +256,21 @@ grub_bsd_add_meta (grub_uint32_t type, const void *data, grub_uint32_t len)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
grub_err_t
grub_bsd_add_meta (grub_uint32_t type, const void *data, grub_uint32_t len)
{
grub_err_t err;
void *ptr;
err = grub_bsd_add_meta_ptr (type, &ptr, len);
if (err)
return err;
if (len)
grub_memcpy (ptr, data, len);
return GRUB_ERR_NONE;
}
struct grub_e820_mmap struct grub_e820_mmap
{ {
grub_uint64_t addr; grub_uint64_t addr;
@ -440,7 +454,11 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
if (n) if (n)
{ {
char cmdline[n], *p; void *cmdline;
char *p;
if (grub_bsd_add_meta_ptr (FREEBSD_MODINFO_ARGS, &cmdline, n))
return grub_errno;
p = cmdline; p = cmdline;
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
@ -450,9 +468,6 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
*(p++) = ' '; *(p++) = ' ';
} }
*p = 0; *p = 0;
if (grub_bsd_add_meta (FREEBSD_MODINFO_ARGS, cmdline, n))
return grub_errno;
} }
} }