grub2/0160-grub-core-disk-efi-efidisk.c-grub_efidisk_get_device.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

45 lines
1.3 KiB
Diff

From 3416608ab2fe1766fe912bb51d7f56e76fd286d9 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 26 Feb 2013 22:45:00 +0100
Subject: [PATCH 160/482] *
grub-core/disk/efi/efidisk.c(grub_efidisk_get_device_name): Fix memory
leak if device name is not found.
---
ChangeLog | 5 +++++
grub-core/disk/efi/efidisk.c | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 1b66689..d770758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-26 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * grub-core/disk/efi/efidisk.c(grub_efidisk_get_device_name): Fix
+ memory leak if device name is not found.
+
2013-02-25 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/normal/menu_entry.c (update_screen): remove
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index 98cd226..19c5923 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -797,7 +797,10 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
dup_ldp->length[1] = 0;
if (!get_diskname_from_path (dup_dp, device_name))
- return 0;
+ {
+ grub_free (dup_dp);
+ return 0;
+ }
parent = grub_disk_open (device_name);
grub_free (dup_dp);
--
1.8.2.1