* grub-core/osdep/unix/password.c (grub_password_get): Check that

	fgets succeeded.

diff --git a/ChangeLog b/ChangeLog
index 190a525911946f81c3bcbc1894df0fbb85b1e554..b883d70bed9c4720b6ad6aba200c11b7e3af1a17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/osdep/unix/password.c (grub_password_get): Check that
+       fgets succeeded.
+
 2013-11-27  Francesco Lavra  <francescolavra.fl@gmail.com>
 
        * docs/grub.texi (ls): Fix command description in case of a device name

diff --git a/grub-core/osdep/unix/password.c b/grub-core/osdep/unix/password.c
index 2e647c766a1e7a19d434a98df2b180e2326eef1d..470a6ea626f14d39e09ae1107019a91e9af603b8 100644 (file)
--- a/grub-core/osdep/unix/password.c
+++ b/grub-core/osdep/unix/password.c
@@ -51,7 +51,9 @@ grub_password_get (char buf[], unsigned buf_size)
     }
   else
     tty_changed = 0;
-  fgets (buf, buf_size, stdin);
+  grub_memset (buf, 0, buf_size);
+  if (!fgets (buf, buf_size, stdin))
+    return 0;
   ptr = buf + strlen (buf) - 1;
   while (buf <= ptr && (*ptr == '\n' || *ptr == '\r'))
     *ptr-- = 0;