grub2/0382-grub-core-loader-i386-xen.c-Initialized-initrd_ctx-s.patch
Peter Jones 8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00

28 lines
874 B
Diff

From 7d3993847466435bcc8c82267f101c5e8193f4be Mon Sep 17 00:00:00 2001
From: Sarah Newman <srn@prgmr.com>
Date: Fri, 27 Mar 2015 12:56:43 -0700
Subject: [PATCH 382/506] grub-core/loader/i386/xen.c: Initialized initrd_ctx
so we don't free a random pointer from the stack.
Signed-off-by: Sarah Newman <srn@prgmr.com>
---
grub-core/loader/i386/xen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index c16b4b2..c4d9689 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -521,7 +521,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
{
grub_size_t size = 0;
grub_err_t err;
- struct grub_linux_initrd_context initrd_ctx;
+ struct grub_linux_initrd_context initrd_ctx = { 0, 0, 0 };
grub_relocator_chunk_t ch;
if (argc == 0)
--
2.4.3