diff --git a/ChangeLog b/ChangeLog
index cfd46dad7..5e45756c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/misc.c (grub_vprintf): Fix a bug on malloc failure.
+
 2011-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix PCI iterating on functions >= 4.
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index a3dfabf82..ebf80f100 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -210,6 +210,7 @@ grub_vprintf (const char *fmt, va_list args)
 	  buf[PREALLOC_SIZE - 2] = '.';
 	  buf[PREALLOC_SIZE - 1] = '.';
 	  buf[PREALLOC_SIZE] = 0;
+	  curbuf = buf;
 	}
       else
 	s = grub_vsnprintf_real (curbuf, s, fmt, ap2);