"enable count" user input error handling (PR gdb/15678)

Typing "enable count" by itself crashes GDB. Also, if you omit the
breakpoint number/range, the error message is not very clear:

(gdb) enable count 2
warning: bad breakpoint number at or near ''
(gdb) enable count
Segmentation fault (core dumped)

With this patch, the error messages are slightly more helpful:

(gdb) enable count 2
Argument required (one or more breakpoint numbers).
(gdb) enable count
Argument required (hit count).

gdb/ChangeLog:

	PR gdb/15678
	* breakpoint.c (map_breakpoint_numbers): Check for empty args
	string.
	(enable_count_command): Check args for NULL value.

gdb/testsuite/ChangeLog:

	PR gdb/15678
	* gdb.base/ena-dis-br.exp: Test "enable count" for bad user input.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7c7e878d84d4b2e80f3549e56abed7e3502959df..dbeef19e1d65422321071e0a9a5d8f8bdff320dc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-06  Simon Marchi  <simon.marchi@ericsson.com>
+
+       PR gdb/15678
+       * breakpoint.c (map_breakpoint_numbers): Check for empty args string.
+       (enable_count_command): Check args for NULL value.
+
 2015-02-05  Doug Evans  <xdje42@gmail.com>
 
        * guile/scm-frame.c: Fix spelling errors in a comment.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index af0c2cfcda8886af45c91cdfe8fb4b6f01fca7b6..2804453060acb5f8d3a7da9086140cc00ab76429 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -14880,7 +14880,7 @@ map_breakpoint_numbers (char *args, void (*function) (struct breakpoint *,
   int match;
   struct get_number_or_range_state state;
 
-  if (args == 0)
+  if (args == 0 || *args == '\0')
     error_no_arg (_("one or more breakpoint numbers"));
 
   init_number_or_range (&state, args);
@@ -15217,7 +15217,12 @@ do_map_enable_count_breakpoint (struct breakpoint *bpt, void *countptr)
 static void
 enable_count_command (char *args, int from_tty)
 {
-  int count = get_number (&args);
+  int count;
+
+  if (args == NULL)
+    error_no_arg (_("hit count"));
+
+  count = get_number (&args);
 
   map_breakpoint_numbers (args, do_map_enable_count_breakpoint, &count);
 }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f8ca4e88e07ef2920e07dfcedd969831852ff02c..c458bd7efb02e90be7ddaf8ccec095ce337e47c9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06  Simon Marchi  <simon.marchi@ericsson.com>
+
+       PR gdb/15678
+       * gdb.base/ena-dis-br.exp: Test "enable count" for bad user input.
+
 2015-02-06  Pedro Alves  <palves@redhat.com>
 
        * gdb.threads/attach-many-short-lived-threads.c (SECONDS): New

diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
index adb4001b67ff4ba76cbb0b215123c2f4a0b641d8..84f84cae4eac79a5232a4f22ea9aa1b6e78d510f 100644 (file)
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ b/gdb/testsuite/gdb.base/ena-dis-br.exp
@@ -151,6 +151,14 @@ set bp [break_at $bp_location7 "line $bp_location7"]
 
 set bp2 [break_at marker1 " line $bp_location15"]
 
+gdb_test "enable count" \
+    "Argument required \\(hit count\\)\\." \
+    "enable count missing arguments"
+
+gdb_test "enable count 2" \
+    "Argument required \\(one or more breakpoint numbers\\)\\." \
+    "enable count missing breakpoint number"
+
 gdb_test_no_output "enable count 2 $bp" "disable break with count"
 
 gdb_test "continue" \