* grub-core/kern/misc.c (grub_vsnprintf_real): Fix fmt2 parsing.

diff --git a/ChangeLog b/ChangeLog
index 7ea8d10016b588544e92df4479f648721cbc3c89..53d151b62090bd90564a4c8c556e2c4cdc729ca2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/misc.c (grub_vsnprintf_real): Fix fmt2 parsing.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/videotest.c (grub_cmd_videotest): Check that

diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 128139dc82c011bdcc6270d98ab09d9437e28d87..0d2ae4bd6c34867bd981faf30c9a9b7cc395ad57 100644 (file)
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -749,6 +749,12 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
       while (*fmt && grub_isdigit (*fmt))
        fmt++;
 
+      if (*fmt && *fmt =='.')
+       fmt++;
+
+      while (*fmt && grub_isdigit (*fmt))
+       fmt++;
+
       p = fmt;
 
       if (*fmt && *fmt == '$')