* util/grub-mkpasswd-pbkdf2.c (main): Don't double-close.

	Reported by: David Volgyes <dvolgyes>.

diff --git a/ChangeLog b/ChangeLog
index abe285ee9616524b4698713065e4bf52b8599e4e..59cb3ec57355f7d0f2dab096b7277a40ecd5c72e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkpasswd-pbkdf2.c (main): Don't double-close.
+       Reported by: David Volgyes <dvolgyes>.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy): Close

diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index dc2afdb6e1663a4ea67d8dc521f20ea538e3cd0d..709ba7da7a18c9e9364a6c6a1e40b3baa66dcebf 100644 (file)
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -270,7 +270,6 @@ main (int argc, char *argv[])
        free (bufhex);
        free (salthex);
        free (salt);
-       fclose (f);
        grub_util_error ("couldn't retrieve random data for salt");
       }
     fclose (f);