gdb:

	* macrocmd.c (macro_define_command): Check for NULL argument.
	(macro_undef_command): Likewise.
gdb/testsuite:
	* gdb.base/macscp.exp: Add regression test for "macro define" or
	"macro undef" with no arguments.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f246016442b0d7d871ed80999640d24e75b76957..3973634a39b3832a5adb784f105f44c17b58b89c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14  Tom Tromey  <tromey@redhat.com>
+
+       * macrocmd.c (macro_define_command): Check for NULL argument.
+       (macro_undef_command): Likewise.
+
 2008-08-14  Pedro Alves  <pedro@codesourcery.com>
 
        * infcmd.c (continue_1): Add an ERROR_NO_INFERIOR call.

diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index 4a70d4fb3d35fe57065bea9e6289910b4b406661..8213c0d703b8e536a0e9a53bc30debb92c415bba 100644 (file)
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -235,8 +235,12 @@ macro_define_command (char *exp, int from_tty)
 {
   struct macro_definition new_macro;
   char *name = NULL;
-  struct cleanup *cleanup_chain = make_cleanup (free_macro_definition_ptr,
-                                               &new_macro);
+  struct cleanup *cleanup_chain;
+
+  if (!exp)
+    error (_("usage: macro define NAME[(ARGUMENT-LIST)] [REPLACEMENT-LIST]"));
+
+  cleanup_chain = make_cleanup (free_macro_definition_ptr, &new_macro);
   make_cleanup (free_current_contents, &name);
 
   memset (&new_macro, 0, sizeof (struct macro_definition));
@@ -308,6 +312,10 @@ static void
 macro_undef_command (char *exp, int from_tty)
 {
   char *name;
+
+  if (!exp)
+    error (_("usage: macro undef NAME"));
+
   skip_ws (&exp);
   name = extract_identifier (&exp);
   if (! name)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b00e52b03d0f5a6e65299976a781ea49e5001570..577d0ebac8d78600905e2afa578097c227e47ee9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.base/macscp.exp: Add regression test for "macro define" or
+       "macro undef" with no arguments.
+
 2008-08-08  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * gdb.base/args.exp: Prevent ~/.gdbinit from affecting test.

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 2df0eef3d3c5ae81d64fd88fe16c6feca68bb4ef..3424714adde2cebf97ff9dfbb66f8a6dba2cbc12 100644 (file)
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -470,6 +470,16 @@ gdb_test "print M" \
     "No symbol \"M\" in current context\." \
     "print expression with macro after user undef."
 
+# Regression test; this used to crash.
+gdb_test "macro define" \
+    "usage: macro define.*" \
+    "macro define with no arguments"
+
+# Regression test; this used to crash.
+gdb_test "macro undef" \
+    "usage: macro undef.*" \
+    "macro undef with no arguments"
+
 # Regression test; this used to emit the wrong error.
 gdb_test "macro expand SPLICE(x, y)" \
   "Token splicing is not implemented yet." \