2008-07-29 Bean <bean123ch@gmail.com>

	* normal/main.c (get_line): Fix buffer overflow bug.

diff --git a/ChangeLog b/ChangeLog
index bf8bfe19d9f5c43f95e0b32e351532d976facf75..488c56c6bd7aa786d8c36aaf634e460fa407e359 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-29  Bean  <bean123ch@gmail.com>
+
+       * normal/main.c (get_line): Fix buffer overflow bug.
+
 2008-07-28  Robert Millan  <rmh@aybabtu.com>
 
        * partmap/apple.c (GRUB_APPLE_HEADER_MAGIC): New macro.

diff --git a/normal/main.c b/normal/main.c
index e5458fc988fb76939cd166f9bcc1d0fbd97339ed..2e6df90ead0ae9f2945d7fdf71cf2ae0f3b8b0fb 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -97,9 +97,6 @@ get_line (grub_file_t file)
        }
       else
        {
-         if (c == '\n')
-           break;
-
          if (pos >= max_len)
            {
              char *old_cmdline = cmdline;
@@ -112,6 +109,9 @@ get_line (grub_file_t file)
                }
            }
 
+         if (c == '\n')
+           break;
+
          cmdline[pos++] = c;
        }
     }