From: Simon Marchi <simon.marchi@ericsson.com>
To: <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@ericsson.com>
Subject: [PATCH] Fix -trace-save crash when argument is missing
Date: Fri, 14 Oct 2016 20:26:00 -0000 [thread overview]
Message-ID: <20161014202536.21670-1-simon.marchi@ericsson.com> (raw)
-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
next reply other threads:[~2016-10-14 20:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 20:26 Simon Marchi [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161014202536.21670-1-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox