From 7de5e20af49344eb3a51e43de8b69881d1a5fc35 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 28 May 2012 17:54:18 +0200 Subject: [PATCH] * grub-core/fs/hfs.c (grub_hfs_dir): Use memset instead of initialisation to avoid __bzero reference. --- ChangeLog | 5 +++++ grub-core/fs/hfs.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ab2e16f25..e3270830a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-28 Vladimir Serbinenko + + * grub-core/fs/hfs.c (grub_hfs_dir): Use memset instead of + initialisation to avoid __bzero reference. + 2012-05-28 Vladimir Serbinenko * grub-core/boot/i386/pc/startup_raw.S [__APPLE__]: Add Apple assembly diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c index 782329588..2b4272ef5 100644 --- a/grub-core/fs/hfs.c +++ b/grub-core/fs/hfs.c @@ -1163,10 +1163,12 @@ grub_hfs_dir (grub_device_t device, const char *path, struct grub_hfs_dirrec *drec = rec->data; struct grub_hfs_filerec *frec = rec->data; struct grub_hfs_catalog_key *ckey = rec->key; - char fname[sizeof (ckey->str) * MAX_UTF8_PER_MAC_ROMAN + 1] = { 0 }; + char fname[sizeof (ckey->str) * MAX_UTF8_PER_MAC_ROMAN + 1]; struct grub_dirhook_info info; grub_size_t len; + grub_memset (fname, 0, sizeof (fname)); + grub_memset (&info, 0, sizeof (info)); len = ckey->strlen;