From 99e8a4f9f8832da0f37c6f35b11629b01897800d Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Wed, 15 Feb 2017 15:08:19 -0500 Subject: PR gdb/21164: maint print {symbols,msymbols,psymbols} without args crash This is a fix for PR gdb/21164. The problem started to happen after: commit 34c41c681f4a0a0dfe0405c7d2aecf458520557a Author: Doug Evans AuthorDate: Mon Dec 19 08:33:46 2016 -0800 New syntax for mt print symbols,msymbols,psymbols. This change introduced new syntax for the mentioned commands, and improved the parsing of arguments by using 'gdb_buildargv'. However, it is necessary to check if the argv being built is not NULL, which can happen if the user doesn't provide any arguments to these commands. gdb/ChangeLog: 2017-02-15 Sergio Durigan Junior PR gdb/21164 * psymtab.c (maintenance_print_psymbols): Verify if 'argv' is not NULL before using it. * symmisc.c (maintenance_print_symbols): Likewise. (maintenance_print_msymbols): Likewise. gdb/testsuite/ChangeLog: gdb/ChangeLog: 2017-02-15 Sergio Durigan Junior PR gdb/21164 * gdb.base/maint.exp: Add testcases for when the commands do not have arguments. --- gdb/symmisc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/symmisc.c') diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 07d571a..ab50570 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -418,7 +418,7 @@ maintenance_print_symbols (char *args, int from_tty) argv = gdb_buildargv (args); cleanups = make_cleanup_freeargv (argv); - for (i = 0; argv[i] != NULL; ++i) + for (i = 0; argv != NULL && argv[i] != NULL; ++i) { if (strcmp (argv[i], "-pc") == 0) { @@ -459,7 +459,7 @@ maintenance_print_symbols (char *args, int from_tty) stdio_file arg_outfile; - if (argv[outfile_idx] != NULL) + if (argv != NULL && argv[outfile_idx] != NULL) { char *outfile_name; @@ -721,7 +721,7 @@ maintenance_print_msymbols (char *args, int from_tty) argv = gdb_buildargv (args); cleanups = make_cleanup_freeargv (argv); - for (i = 0; argv[i] != NULL; ++i) + for (i = 0; argv != NULL && argv[i] != NULL; ++i) { if (strcmp (argv[i], "-objfile") == 0) { @@ -747,7 +747,7 @@ maintenance_print_msymbols (char *args, int from_tty) stdio_file arg_outfile; - if (argv[outfile_idx] != NULL) + if (argv != NULL && argv[outfile_idx] != NULL) { char *outfile_name; -- cgit v1.1