* grub-core/commands/i386/pc/play.c (grub_cmd_play): Improve error

	handling.

diff --git a/ChangeLog b/ChangeLog
index 3e9bde96207af76c26151798f0c8dd6a82be02eb..5aec20e5df4a49650043c8ea8782a802f88c6c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/i386/pc/play.c (grub_cmd_play): Improve error
+       handling.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/hdparm.c (grub_cmd_hdparm): Allow running

diff --git a/grub-core/commands/i386/pc/play.c b/grub-core/commands/i386/pc/play.c
index 32c34a81046eda34055bc088bd84dbaaf3b59f44..dc22558049ee9c3286b26489cffb0bdd1c799afd 100644 (file)
--- a/grub-core/commands/i386/pc/play.c
+++ b/grub-core/commands/i386/pc/play.c
@@ -237,16 +237,20 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
       for (i = 1; i + 1 < argc; i += 2)
         {
           note.pitch = grub_strtoul (args[i], &end, 0);
+         if (grub_errno)
+           break;
           if (*end)
             {
-              grub_error (GRUB_ERR_BAD_NUMBER, "bogus pitch number");
+              grub_error (GRUB_ERR_BAD_NUMBER, N_("unrecognized number"));
               break;
             }
 
           note.duration = grub_strtoul (args[i + 1], &end, 0);
+         if (grub_errno)
+           break;
           if (*end)
             {
-              grub_error (GRUB_ERR_BAD_NUMBER, "bogus duration number");
+              grub_error (GRUB_ERR_BAD_NUMBER, N_("unrecognized number"));
               break;
             }