From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Mon, 1 Dec 2014 17:54:12 +0000 (+0300)
Subject: grub-core/fs/zfs/zfsinfo.c: memory leak in print_vdev_info
X-Git-Tag: 2.02-beta3~596
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d79a878ba04db2cfbbe05564728748de0f6a2f;p=thirdparty%2Fgrub.git

grub-core/fs/zfs/zfsinfo.c: memory leak in print_vdev_info

CID: 73635
---

diff --git a/ChangeLog b/ChangeLog
index 21434fffb..dd44cd8a5 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 c96bf2183..c8a28acf5 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)
     {