From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Feb 2012 16:38:13 +0000 (+0100)
Subject: 	* grub-core/commands/i386/pc/play.c (grub_cmd_play): Improve error
X-Git-Tag: 2.00~617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306fc0741fc5232c3d8ae2243a36c69a79d292d7;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 3e9bde962..5aec20e5d 100644
--- 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 32c34a810..dc2255804 100644
--- 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;
             }