From: Joel Brobecker <brobecker@gnat.com>
Date: Sat, 2 Dec 2006 17:54:50 +0000 (+0000)
Subject: 	From Daniel Jacobowitz  <dan@codesourcery.com>
X-Git-Tag: gdb_6_6-2006-12-18-release~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80f3b71968a65e6b2ad0ec3509745e94122d4497;p=thirdparty%2Fbinutils-gdb.git

	From Daniel Jacobowitz  <dan@codesourcery.com>
	* utils.c (string_to_core_addr): Use error instead of
	internal_error.
	* mi/mi-main.c (mi_execute_command): Check for a NULL message.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 92471914d7a..397a93a3a75 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-02  Joel Brobecker  <brobecker@adacore.com>
+
+	From Daniel Jacobowitz  <dan@codesourcery.com>
+	* utils.c (string_to_core_addr): Use error instead of
+	internal_error.
+	* mi/mi-main.c (mi_execute_command): Check for a NULL message.
+
 2006-11-24  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* NEWS: New port to Cell Broadband Engine SPU.
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index e2e084005c5..abb43f33241 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1183,7 +1183,10 @@ mi_execute_command (char *cmd, int from_tty)
 	     somewhere.  */
 	  fputs_unfiltered (command->token, raw_stdout);
 	  fputs_unfiltered ("^error,msg=\"", raw_stdout);
-	  fputstr_unfiltered (result.message, '"', raw_stdout);
+	  if (result.message == NULL)
+	    fputs_unfiltered ("unknown error", raw_stdout);
+	  else
+	      fputstr_unfiltered (result.message, '"', raw_stdout);
 	  fputs_unfiltered ("\"\n", raw_stdout);
 	  mi_out_rewind (uiout);
 	}
diff --git a/gdb/utils.c b/gdb/utils.c
index c64629c5161..b33eadd1878 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2865,7 +2865,7 @@ string_to_core_addr (const char *my_string)
 	  else if (isxdigit (my_string[i]))
 	    addr = (tolower (my_string[i]) - 'a' + 0xa) + (addr * 16);
 	  else
-	    internal_error (__FILE__, __LINE__, _("invalid hex"));
+	    error (_("invalid hex \"%s\""), my_string);
 	}
     }
   else
@@ -2877,7 +2877,7 @@ string_to_core_addr (const char *my_string)
 	  if (isdigit (my_string[i]))
 	    addr = (my_string[i] - '0') + (addr * 10);
 	  else
-	    internal_error (__FILE__, __LINE__, _("invalid decimal"));
+	    error (_("invalid decimal \"%s\""), my_string);
 	}
     }
   return addr;