From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-testers-return-145406-listarch-gdb-testers=sources.redhat.com@sourceware.org>
Received: (qmail 118327 invoked by alias); 21 Aug 2019 21:28:21 -0000
Mailing-List: contact gdb-testers-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-testers.sourceware.org>
List-Subscribe: <mailto:gdb-testers-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-testers/>
List-Post: <mailto:gdb-testers@sourceware.org>
List-Help: <mailto:gdb-testers-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-testers-owner@sourceware.org
Received: (qmail 118314 invoked by uid 89); 21 Aug 2019 21:28:20 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-15.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:2271
X-HELO: kwanyin.sergiodj.net
Received: from kwanyin.sergiodj.net (HELO kwanyin.sergiodj.net) (158.69.185.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 21 Aug 2019 21:28:18 +0000
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [binutils-gdb] Fix nullptr in with_command_1
From: gdb-buildbot@sergiodj.net
To: gdb-testers@sourceware.org
Message-Id: <26c957f12762816a90d5145c7c527ca48c890855@gdb-build>
Date: Wed, 21 Aug 2019 21:57:00 -0000
X-SW-Source: 2019-q3/txt/msg03220.txt.bz2

*** TEST RESULTS FOR COMMIT 26c957f12762816a90d5145c7c527ca48c890855 ***

commit 26c957f12762816a90d5145c7c527ca48c890855
Author:     Pedro Alves <palves@redhat.com>
AuthorDate: Wed Aug 21 21:11:33 2019 +0100
Commit:     Pedro Alves <palves@redhat.com>
CommitDate: Wed Aug 21 21:11:33 2019 +0100

    Fix nullptr in with_command_1
    
    Running 'with' without arguments crashes GDB.  This fixes it.
    
    gdb/ChangeLog:
    2019-08-21  Bogdan Harjoc  <harjoc@gmail.com>
    
            * cli/cli-cmds.c (with_command_1): Error out if no arguments.
    
    gdb/testsuite/ChangeLog:
    2019-08-21  Pedro Alves  <palves@redhat.com>
    
            * gdb.base/with.exp: Test "with" with no arguments.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01e60fb189..966bfb7d9f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-21  Bogdan Harjoc  <harjoc@gmail.com>
+
+	* cli/cli-cmds.c (with_command_1): Error out if no arguments.
+
 2019-08-21  Christian Biesinger  <cbiesinger@google.com>
 
 	* tui/tui-data.h (tui_gen_win_info): Add an =default
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 30e0958b60..4fc656775c 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -217,6 +217,9 @@ void
 with_command_1 (const char *set_cmd_prefix,
 		cmd_list_element *setlist, const char *args, int from_tty)
 {
+  if (args == nullptr)
+    error (_("Missing arguments."));
+
   const char *delim = strstr (args, "--");
   const char *nested_cmd = nullptr;
 
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7fea9cd071..e56cc16628 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-21  Pedro Alves  <palves@redhat.com>
+
+	* gdb.base/with.exp: Test "with" with no arguments.
+
 2019-08-21  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/gdb-caching-proc.exp: Sort files.
diff --git a/gdb/testsuite/gdb.base/with.exp b/gdb/testsuite/gdb.base/with.exp
index 9ea768563a..a972296d78 100644
--- a/gdb/testsuite/gdb.base/with.exp
+++ b/gdb/testsuite/gdb.base/with.exp
@@ -220,6 +220,8 @@ with_test_prefix "run control" {
 
 # Check errors.
 with_test_prefix "errors" {
+    gdb_test "with" "Missing arguments\\."
+
     # Try both an unknown root setting and an unknown prefixed
     # setting.  The errors come from different locations in the
     # sources.