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

CID: 73635

diff --git a/ChangeLog b/ChangeLog
index 21434fffbae34b10b4bbd1c9083ec5466fe30d3a..dd44cd8a56f9e2bf5d94fd43cfd1086d41b0f212 100644 (file)
--- 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 c96bf2183c09e0df909537513b7cb22b7030bc1f..c8a28acf52b89d152c1d91f30826be740d8e8aea 100644 (file)
--- 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)
     {