diff --git a/ChangeLog b/ChangeLog
index 316646267..2826e024f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-31  Christer Weinigel <christer@weinigel.se>
+
+	* grub-core/normal/main.c (grub_file_getline): Fix off-by-one error.
+
 2012-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/linux.c (grub_linux_boot): Use right version.
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index feeb1ef13..eb4b1c721 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -65,7 +65,7 @@ grub_file_getline (grub_file_t file)
 	continue;
 
 
-      if (pos >= max_len)
+      if (pos + 1 >= max_len)
 	{
 	  char *old_cmdline = cmdline;
 	  max_len = max_len * 2;