diff --git a/ChangeLog b/ChangeLog
index fb5f6ef91..39e6a4f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/cmdline.c (grub_cmdline_get): Free cl_terms on
+	return.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/gfxterm.c (grub_gfxterm_term_fini): Free the text buffer.
diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
index daa0a1adb..3647dcd3a 100644
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -585,6 +585,7 @@ grub_cmdline_get (const char *prompt)
 	  break;
 
 	case '\e':
+	  grub_free (cl_terms);
 	  return 0;
 
 	case '\b':
@@ -635,5 +636,6 @@ grub_cmdline_get (const char *prompt)
 
   ret = grub_ucs4_to_utf8_alloc (buf + lpos, llen - lpos + 1);
   grub_free (buf);
+  grub_free (cl_terms);
   return ret;
 }