* grub-core/lib/legacy_parse.c (grub_legacy_parse): Correctly handle

	hexadecimal.

diff --git a/ChangeLog b/ChangeLog
index cdfc826882c46f3bd325627eb2b184f17c675f3a..7785ac9f762cd8b198fab35b607556431d8eeb17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/legacy_parse.c (grub_legacy_parse): Correctly handle
+       hexadecimal.
+
 2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/efiemu/main.c (grub_efiemu_load_file): Return grub_errno

diff --git a/grub-core/lib/legacy_parse.c b/grub-core/lib/legacy_parse.c
index 0248490558d762fe512159b79c69c8f68ae4ef8b..659fa7061a9ec7db0bb671ba7fb980e64114ede7 100644 (file)
--- a/grub-core/lib/legacy_parse.c
+++ b/grub-core/lib/legacy_parse.c
@@ -680,7 +680,10 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)
              int base = 10;
              brk = curarg;
              if (brk[0] == '0' && brk[1] == 'x')
-               base = 16;
+               {
+                 base = 16;
+                 brk += 2;
+               }
              else if (brk[0] == '0')
                base = 8;
              for (; *brk && brk < curarg + curarglen; brk++)