From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Fri, 26 Jun 2015 06:25:30 +0000 (+0300)
Subject: chainloader: fix resoource leak
X-Git-Tag: 2.02-beta3~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c058e85615fde15d9593ff0377cf3de94a906fac;p=thirdparty%2Fgrub.git

chainloader: fix resoource leak

Found by: Coverity scan.
CID: 96651
---

diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index ec23cf4ed..522a716e3 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -350,9 +350,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
     }
   loaded_image->device_handle = dev_handle;
 
-  grub_file_close (file);
-  file = NULL;
-
   if (argc > 1)
     {
       int i, len;
@@ -382,6 +379,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
       loaded_image->load_options_size = len;
     }
 
+  grub_file_close (file);
+  grub_device_close (dev);
+
   grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
   return 0;