From patchwork Sun Nov 17 22:52:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36001 Received: (qmail 84118 invoked by alias); 17 Nov 2019 22:52:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 84108 invoked by uid 89); 17 Nov 2019 22:52:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=hel, sk:string_, sk:tui_cop X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 17 Nov 2019 22:52:18 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 3F8202041E; Sun, 17 Nov 2019 17:52:16 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id DBBC220300 for ; Sun, 17 Nov 2019 17:52:10 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id C10602816F for ; Sun, 17 Nov 2019 17:52:10 -0500 (EST) X-Gerrit-PatchSet: 1 Date: Sun, 17 Nov 2019 17:52:10 -0500 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Fix latent bug in tui_copy_source_line X-Gerrit-Change-Id: I46cdabe6e57549983149b8f640cda5edd16fa260 X-Gerrit-Change-Number: 683 X-Gerrit-ChangeURL: X-Gerrit-Commit: 86c66e99db107e2d28f7b4a83869ed8d7944ff10 References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/683 ...................................................................... Fix latent bug in tui_copy_source_line tui_copy_source_line has a bug, where it can advance past the terminating \0 in its input string. This patch fixes the bug and adds a test case for this function. gdb/ChangeLog 2019-11-17 Tom Tromey * tui/tui-winsource.c (tui_copy_source_line): Don't advance past \0. * unittests/tui-selftests.c: New file. * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add tui-selftests.c. Change-Id: I46cdabe6e57549983149b8f640cda5edd16fa260 --- M gdb/ChangeLog M gdb/Makefile.in M gdb/tui/tui-winsource.c A gdb/unittests/tui-selftests.c 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 90a2b64..5409892 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-11-17 Tom Tromey + + * tui/tui-winsource.c (tui_copy_source_line): Don't advance past + \0. + * unittests/tui-selftests.c: New file. + * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add tui-selftests.c. + 2019-11-15 Christian Biesinger * Makefile.in: Replace {posix,mingw}-strerror.c with safe-strerror.c. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5a4ffd5..0a1f7c5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -438,6 +438,7 @@ unittests/string_view-selftests.c \ unittests/style-selftests.c \ unittests/tracepoint-selftests.c \ + unittests/tui-selftests.c \ unittests/unpack-selftests.c \ unittests/utils-selftests.c \ unittests/vec-utils-selftests.c \ diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 3ca723c..6d01bd8 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -98,6 +98,8 @@ lineptr += skip_bytes; continue; } + if (c == '\0') + break; ++lineptr; ++column; diff --git a/gdb/unittests/tui-selftests.c b/gdb/unittests/tui-selftests.c new file mode 100644 index 0000000..c2cdcae --- /dev/null +++ b/gdb/unittests/tui-selftests.c @@ -0,0 +1,48 @@ +/* Self tests for the TUI + + Copyright (C) 2019 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 . */ + +#include "defs.h" +#include "gdbsupport/selftest.h" +#include "tui/tui-winsource.h" + +namespace selftests { +namespace tui { + +static void +run_tests () +{ + const char *text = "hello"; + std::string result = tui_copy_source_line (&text, 0, 0, 50); + SELF_CHECK (result == "hello"); + SELF_CHECK (*text == '\0'); + + text = "hello\n"; + result = tui_copy_source_line (&text, 0, 0, 3); + SELF_CHECK (result == "hel"); + SELF_CHECK (*text == '\0'); +} + +} /* namespace tui*/ +} /* namespace selftests */ + +void +_initialize_tui_selftest () +{ + selftests::register_test ("tui", selftests::tui::run_tests); +}