commands/legacycfg: Fix resource leaks.

diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
index 2c09fb7dd7803e532146a922cef578ed8bef1880..d42d7779ec5c9c1845b498e99d60def0f65322ca 100644 (file)
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -57,14 +57,20 @@ legacy_file (const char *filename)
 
   file = grub_file_open (filename);
   if (! file)
-    return grub_errno;
+    {
+      grub_free (suffix);
+      return grub_errno;
+    }
 
   menu = grub_env_get_menu ();
   if (! menu)
     {
       menu = grub_zalloc (sizeof (*menu));
       if (! menu)
-       return grub_errno;
+       {
+         grub_free (suffix);
+         return grub_errno;
+       }
 
       grub_env_set_menu (menu);
     }
@@ -77,6 +83,7 @@ legacy_file (const char *filename)
       if (!buf && grub_errno)
        {
          grub_file_close (file);
+         grub_free (suffix);
          return grub_errno;
        }
 
@@ -173,6 +180,8 @@ legacy_file (const char *filename)
       if (!args)
        {
          grub_file_close (file);
+         grub_free (suffix);
+         grub_free (entrysrc);
          return grub_errno;
        }
       args[0] = entryname;
@@ -376,6 +385,8 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
              if (part && grub_strcmp (part->partmap->name, "msdos") == 0)
                bsd_slice = part->number;
            }
+         if (dev)
+           grub_device_close (dev);
        }
        
        /* k*BSD didn't really work well with grub-legacy.  */