8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From 03d79a878ba04db2cfbbe05564728748de0f6a2f Mon Sep 17 00:00:00 2001
|
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
Date: Mon, 1 Dec 2014 20:54:12 +0300
|
|
Subject: [PATCH 126/506] grub-core/fs/zfs/zfsinfo.c: memory leak in
|
|
print_vdev_info
|
|
|
|
CID: 73635
|
|
---
|
|
ChangeLog | 5 +++++
|
|
grub-core/fs/zfs/zfsinfo.c | 2 ++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 21434ff..dd44cd8 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2014-12-01 Andrei Borzenkov <arvidjaar@gmail.com>
|
|
+
|
|
+ * grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix memory leak
|
|
+ (CID 73635).
|
|
+
|
|
2014-11-30 Andrei Borzenkov <arvidjaar@gmail.com>
|
|
|
|
* grub-core/lib/syslinux_parse.c (free_menu): Do not free
|
|
diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
|
|
index c96bf21..c8a28ac 100644
|
|
--- a/grub-core/fs/zfs/zfsinfo.c
|
|
+++ b/grub-core/fs/zfs/zfsinfo.c
|
|
@@ -130,10 +130,12 @@ print_vdev_info (char *nvlist, int tab)
|
|
grub_free (bootpath);
|
|
grub_free (devid);
|
|
grub_free (path);
|
|
+ grub_free (type);
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
char is_mirror=(grub_strcmp(type,VDEV_TYPE_MIRROR) == 0);
|
|
char is_raidz=(grub_strcmp(type,VDEV_TYPE_RAIDZ) == 0);
|
|
+ grub_free (type);
|
|
|
|
if (is_mirror || is_raidz)
|
|
{
|
|
--
|
|
2.4.3
|
|
|