From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 13 Dec 2011 18:55:27 +0000 (+0100)
Subject: 	* grub-core/kern/misc.c (grub_vsnprintf_real): Fix fmt2 parsing.
X-Git-Tag: 2.00~882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd261d7300a25e4f4de9e2016147ee686d455f29;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 7ea8d1001..53d151b62 100644
--- 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 128139dc8..0d2ae4bd6 100644
--- 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 == '$')