From ff7dc2550f289f0ead3e4ee6a74003be7c98152f Mon Sep 17 00:00:00 2001 From: Aaron Luft Date: Mon, 14 Mar 2016 16:48:33 -0400 Subject: [PATCH 1/2] Remove the variable oldname which is attempting to free stack space. --- grub-core/fs/iso9660.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c index 67a67cf..c9c8374 100644 --- a/grub-core/fs/iso9660.c +++ b/grub-core/fs/iso9660.c @@ -750,19 +750,15 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, if (dir->data->joliet && !ctx.filename) { - char *oldname, *semicolon; + char *semicolon; - oldname = name; ctx.filename = grub_iso9660_convert_string - ((grub_uint8_t *) oldname, dirent.namelen >> 1); + ((grub_uint8_t *) name, dirent.namelen >> 1); semicolon = grub_strrchr (ctx.filename, ';'); if (semicolon) *semicolon = '\0'; - if (ctx.filename_alloc) - grub_free (oldname); - ctx.filename_alloc = 1; } -- 2.5.0 From c50f4167c59adefd30a6179fc967fecf33c7a895 Mon Sep 17 00:00:00 2001 From: Aaron Luft Date: Mon, 14 Mar 2016 16:48:56 -0400 Subject: [PATCH 2/2] Initialize the value of mdnobj to silence the compiler warning --- grub-core/fs/zfs/zfsinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c index c8a28ac..926f966 100644 --- a/grub-core/fs/zfs/zfsinfo.c +++ b/grub-core/fs/zfs/zfsinfo.c @@ -352,7 +352,7 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc, char *fsname; char *bootfs; char *poolname; - grub_uint64_t mdnobj; + grub_uint64_t mdnobj = 0; if (argc < 1) return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); -- 2.5.0