* 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 6712d8c891bc85c450d878c28c03cc015b9d31e9..1ecd3683c4b4e6aea5693e3886c897659e5ce24d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-17  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-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * NEWS: Mention QPassSignals.

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index e2e084005c5237e27f2e83f9f160741fd2414797..abb43f33241424912370c928d9cf40c8913f7847 100644 (file)
--- 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 c64629c5161f0cdfb1d7e2ea604aa076aee378c7..b33eadd1878610956837a3c00b4c0f8ddbd906c1 100644 (file)
--- 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;