From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id A3C6E385F024; Fri, 20 Mar 2020 14:36:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3C6E385F024 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix assert in c-exp.y X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: f67210ff1c4200ea668189d086c6b39145cd876f X-Git-Newrev: f7d4f0b1b9519fa10eb04cb195bdf7b5044d73c7 Message-Id: <20200320143644.A3C6E385F024@sourceware.org> Date: Fri, 20 Mar 2020 14:36:44 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2020 14:36:44 -0000 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f7d4f0b1b9519fa10eb04cb195bdf7b5044d73c7 commit f7d4f0b1b9519fa10eb04cb195bdf7b5044d73c7 Author: Tom Tromey Date: Fri Mar 20 08:10:59 2020 -0600 Fix assert in c-exp.y The "restrict" patch added some asserts to c-exp.y, but one spot was copy-pasted and referred to the wrong table. This was pointed out by -fsanitize=address. This patch fixes the bug. gdb/ChangeLog 2020-03-20 Tom Tromey * c-exp.y (lex_one_token): Fix assert. Diff: --- gdb/ChangeLog | 4 ++++ gdb/c-exp.y | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 583ec9c81e3..1be14b15d18 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-03-20 Tom Tromey + + * c-exp.y (lex_one_token): Fix assert. + 2020-03-20 Tom Tromey * ada-tasks.c (read_atcb): Use smaller length in strncpy call. diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 50a2eef98b5..a4efaab79c8 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -2580,7 +2580,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name) if ((tokentab2[i].flags & FLAG_CXX) != 0 && par_state->language ()->la_language != language_cplus) break; - gdb_assert ((tokentab3[i].flags & FLAG_C) == 0); + gdb_assert ((tokentab2[i].flags & FLAG_C) == 0); pstate->lexptr += 2; yylval.opcode = tokentab2[i].opcode;