diff --git a/ChangeLog b/ChangeLog
index bf8bfe19d..488c56c6b 100644
--- 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 e5458fc98..2e6df90ea 100644
--- 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;
 	}
     }