Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [PATCH] Fix -trace-save crash when argument is missing
@ 2016-10-14 20:26 Simon Marchi
  2016-10-17 20:09 ` Yao Qi
  0 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2016-10-14 20:26 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

-trace-save doesn't check whether an argument is passed, leading to a
segfault if you pass nothing.

I added a small test, which only tests the error conditions of
-trace-save.

gdb/ChangeLog:

	* mi/mi-main.c (mi_cmd_trace_save): Check if argument is present
	before using it.

gdb/testsuite/ChangeLog:

	* gdb.trace/mi-trace-save.exp: New file.
---
 gdb/mi/mi-main.c                          |  4 +++
 gdb/testsuite/gdb.trace/mi-trace-save.exp | 41 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 gdb/testsuite/gdb.trace/mi-trace-save.exp

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 7cd9706..479d3a4 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2699,6 +2699,10 @@ mi_cmd_trace_save (char *command, char **argv, int argc)
 	  break;
 	}
     }
+
+  if (oind >= argc)
+    error (_("Argument required (file in which to save trace data)"));
+
   filename = argv[oind];
 
   if (generate_ctf)
diff --git a/gdb/testsuite/gdb.trace/mi-trace-save.exp b/gdb/testsuite/gdb.trace/mi-trace-save.exp
new file mode 100644
index 0000000..52ad9f1
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/mi-trace-save.exp
@@ -0,0 +1,41 @@
+# Copyright 2016 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# The -trace-save command is already tested in other files (e.g.
+# mi-trace-frame-collected.exp), so this file currently only tests the error
+# cases of -trace-save.
+
+load_lib mi-support.exp
+
+mi_gdb_start
+
+# Test without the required "filename" argument.
+
+proc test_trace_save_missing_arg { } {
+    set err_re [string_to_regexp "^error,msg=\"Argument required (file in which to save trace data)\""]
+
+    mi_gdb_test "-trace-save" "$err_re" "-trace-save with missing argument"
+}
+
+# Test with an unrecognized option.
+
+proc test_trace_save_wrong_opt { } {
+    set err_re [string_to_regexp "^error,msg=\"-trace-save: Unknown option ``hey''\""]
+
+    mi_gdb_test "-trace-save -hey" "$err_re" "-trace-save with wrong option"
+}
+
+test_trace_save_missing_arg
+test_trace_save_wrong_opt
-- 
2.10.1


^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-10-17 21:08 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-14 20:26 [PATCH] Fix -trace-save crash when argument is missing Simon Marchi
2016-10-17 20:09 ` Yao Qi
2016-10-17 20:37   ` Simon Marchi
2016-10-17 20:50     ` Simon Marchi
2016-10-17 20:56       ` Simon Marchi
2016-10-17 20:59       ` Pedro Alves
2016-10-17 21:07         ` Simon Marchi
2016-10-17 21:08           ` Pedro Alves

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox