[binutils-gdb] Fix latent bug in tui_copy_source_line

[binutils-gdb] Fix latent bug in tui_copy_source_line

[gdb-buildbot]

*** TEST RESULTS FOR COMMIT 517d261dfafb7e5317b841b01ab853a76deb8128 ***

commit 517d261dfafb7e5317b841b01ab853a76deb8128
Author:     Tom Tromey <tom@tromey.com>
AuthorDate: Sun Nov 17 15:50:31 2019 -0700
Commit:     Tom Tromey <tom@tromey.com>
CommitDate: Sun Dec 1 12:29:50 2019 -0700

    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-12-01  Tom Tromey  <tom@tromey.com>
    
            * 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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 67b76dc2ef..e61b08b49c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-01  Tom Tromey  <tom@tromey.com>
+
+	* 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-12-01  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui.c (tui_enable): Call tui_update_variables earlier.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 58f5f93c54..e5c8faaa9a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -442,6 +442,7 @@ SUBDIR_UNITTESTS_SRCS = \
 	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 81937c100c..6653709e7c 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -103,6 +103,8 @@ tui_copy_source_line (const char **ptr, int line_no, int first_col,
 	  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 0000000000..3a5d34fe48
--- /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 <http://www.gnu.org/licenses/>.  */
+
+#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, 0);
+  SELF_CHECK (result == "hello");
+  SELF_CHECK (*text == '\0');
+
+  text = "hello\n";
+  result = tui_copy_source_line (&text, 0, 0, 3, 0);
+  SELF_CHECK (result == "hel");
+  SELF_CHECK (*text == '\0');
+}
+
+} /* namespace tui*/
+} /* namespace selftests */
+
+void
+_initialize_tui_selftest ()
+{
+  selftests::register_test ("tui", selftests::tui::run_tests);
+}

Failures on Ubuntu-Aarch64-native-extended-gdbserver-m64, branch master

[gdb-buildbot]

Buildername:
        Ubuntu-Aarch64-native-extended-gdbserver-m64

Worker:
        ubuntu-aarch64

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/5/builds/1277

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Ubuntu-Aarch64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128/

*** Diff to previous build ***
==============================================
new KFAIL: gdb.xml/tdesc-arch.exp: set tdesc filename tdesc-arch.xml
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Ubuntu-Aarch64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Ubuntu-Aarch64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.table.gz>

*** COMPILATION FAILED *** Failures on Fedora-i686, branch master *** BREAKAGE ***

[gdb-buildbot]

Buildername:
        Fedora-i686

Worker:
        fedora-x86-64-2

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/18/builds/1414

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

*** FAILED to build GDB -- compile gdb ***
==============================================

+++ The full log is too big to be posted here.
+++ These are the last 100 lines of it.

  CXX    unittests/xml-utils-selftests.o
  CXX    user-regs.o
  CXX    utils.o
  CXX    v850-tdep.o
  CXX    valarith.o
  CXX    valops.o
  CXX    valprint.o
  CXX    value.o
  CXX    varobj.o
  CXX    vax-nbsd-tdep.o
  CXX    vax-tdep.o
  GEN    stamp-version
  CXX    windows-tdep.o
  CXX    x86-linux-nat.o
  CXX    x86-nat.o
  CXX    x86-tdep.o
  CXX    xcoffread.o
  GEN    xml-builtin.c
  CXX    xml-support.o
  CXX    xml-syscall.o
  CXX    xml-tdesc.o
  CXX    xstormy16-tdep.o
  CXX    xtensa-config.o
  CXX    xtensa-linux-tdep.o
  CXX    xtensa-tdep.o
  CXX    gdb.o
  CXX    aarch32-tdep.o
  CXX    ada-exp.o
  CXX    ada-lang.o
  CXX    ada-tasks.o
  CXX    ada-typeprint.o
  CXX    ada-valprint.o
  CXX    ada-varobj.o
  CXX    addrmap.o
  CXX    agent.o
  CXX    alloc.o
  CXX    annotate.o
  CXX    arc-tdep.o
  CXX    arch-utils.o
  CXX    arch/aarch32.o
  CXX    arch/arm-get-next-pcs.o
  CXX    arch/arm-linux.o
  CXX    arch/arm.o
  CXX    arch/i386.o
  CXX    arch/ppc-linux-common.o
  CXX    arch/riscv.o
  CXX    arm-bsd-tdep.o
  CXX    arm-fbsd-tdep.o
  CXX    arm-linux-tdep.o
  CXX    arm-nbsd-tdep.o
  CXX    arm-obsd-tdep.o
  CXX    arm-pikeos-tdep.o
  CXX    arm-symbian-tdep.o
  CXX    arm-tdep.o
  CXX    arm-wince-tdep.o
  CXX    auto-load.o
  CXX    auxv.o
  CXX    avr-tdep.o
  CXX    ax-gdb.o
  CXX    ax-general.o
  CXX    bcache.o
  CXX    bfd-target.o
  CXX    bfin-linux-tdep.o
  CXX    bfin-tdep.o
  CXX    block.o
  CXX    blockframe.o
  CXX    break-catch-sig.o
  CXX    break-catch-syscall.o
  CXX    break-catch-throw.o
  CXX    breakpoint.o
  CXX    bsd-uthread.o
  CXX    btrace.o
  CXX    build-id.o
  CXX    buildsym-legacy.o
  CXX    buildsym.o
  CXX    c-exp.o
  CXX    cp-name-parser.o
  CXX    d-exp.o
  CXX    f-exp.o
  CXX    go-exp.o
  CXX    m2-exp.o
  CXX    p-exp.o
  CXX    rust-exp.o
  CXX    version.o
  CXX    xml-builtin.o
  GEN    init.c
  CXX    init.o
  CXXLD  gdb
/usr/bin/ld: unittests/tui-selftests.o: in function `selftests::tui::run_tests()':
/home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build/gdb/../../binutils-gdb/gdb/unittests/tui-selftests.c:31: undefined reference to `tui_copy_source_line[abi:cxx11](char const**, int, int, int, int)'
/usr/bin/ld: /home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build/gdb/../../binutils-gdb/gdb/unittests/tui-selftests.c:36: undefined reference to `tui_copy_source_line[abi:cxx11](char const**, int, int, int, int)'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:1911: gdb] Error 1
make[2]: Leaving directory '/home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build/gdb'
make[1]: *** [Makefile:9230: all-gdb] Error 2
make[1]: Leaving directory '/home/gdb-buildbot-2/fedora-x86-64-2/fedora-i686/build'
make: *** [Makefile:852: all] Error 2
program finished with exit code 2
elapsedTime=417.350608
==============================================

Failures on Fedora-x86_64-native-extended-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-extended-gdbserver-m32

Worker:
        fedora-x86-64-1

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/4/builds/1411

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128/

*** Diff to previous build ***
==============================================
new FAIL: gdb.base/corefile.exp: core-file warning-free
FAIL -> UNRESOLVED: gdb.mi/mi-exec-run.exp: inferior-tty=main: mi=main: force-fail=1: run failure detected
FAIL -> UNRESOLVED: gdb.mi/mi-exec-run.exp: inferior-tty=main: mi=separate: force-fail=1: run failure detected
FAIL -> UNRESOLVED: gdb.mi/mi-exec-run.exp: inferior-tty=separate: mi=main: force-fail=1: run failure detected
FAIL -> UNRESOLVED: gdb.mi/mi-exec-run.exp: inferior-tty=separate: mi=separate: force-fail=1: run failure detected
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.table.gz>

*** COMPILATION FAILED *** Failures on Fedora-x86_64-w64-mingw32, branch master *** BREAKAGE ***

[gdb-buildbot]

Buildername:
        Fedora-x86_64-w64-mingw32

Worker:
        fedora-x86-64-1

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/23/builds/1198

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

*** FAILED to build GDB -- compile gdb ***
==============================================

+++ The full log is too big to be posted here.
+++ These are the last 100 lines of it.

  CXX    sparc-sol2-tdep.o
  CXX    sparc-tdep.o
  CXX    sparc64-fbsd-tdep.o
  CXX    sparc64-linux-tdep.o
  CXX    sparc64-nbsd-tdep.o
  CXX    sparc64-obsd-tdep.o
  CXX    sparc64-sol2-tdep.o
  CXX    sparc64-tdep.o
  CXX    stabsread.o
  CXX    stack.o
  CXX    stap-probe.o
  CXX    std-regs.o
  CXX    symfile-debug.o
  CXX    symfile-mem.o
  CXX    symfile.o
  CXX    symmisc.o
  CXX    symtab.o
  CXX    target-dcache.o
  CXX    target-descriptions.o
  CXX    target-float.o
  CXX    target-memory.o
  CXX    target.o
  CXX    target/waitstatus.o
  CXX    test-target.o
  CXX    thread-iter.o
  CXX    thread.o
  CXX    tic6x-linux-tdep.o
  CXX    tic6x-tdep.o
  CXX    tid-parse.o
  CXX    tilegx-linux-tdep.o
  CXX    tilegx-tdep.o
  CXX    top.o
  CXX    tracectf.o
  CXX    tracefile-tfile.o
  CXX    tracefile.o
  CXX    tracepoint.o
  CXX    trad-frame.o
  CXX    tramp-frame.o
  CXX    type-stack.o
  CXX    typeprint.o
  CXX    ui-file.o
  CXX    ui-out.o
  CXX    ui-style.o
  CXX    unittests/array-view-selftests.o
  CXX    unittests/child-path-selftests.o
  CXX    unittests/cli-utils-selftests.o
  CXX    unittests/common-utils-selftests.o
  CXX    unittests/copy_bitwise-selftests.o
  CXX    unittests/environ-selftests.o
  CXX    unittests/format_pieces-selftests.o
  CXX    unittests/function-view-selftests.o
  CXX    unittests/help-doc-selftests.o
  CXX    unittests/lookup_name_info-selftests.o
  CXX    unittests/main-thread-selftests.o
  CXX    unittests/memory-map-selftests.o
  CXX    unittests/memrange-selftests.o
  CXX    unittests/mkdir-recursive-selftests.o
  CXX    unittests/observable-selftests.o
  CXX    unittests/offset-type-selftests.o
  CXX    unittests/optional-selftests.o
  CXX    unittests/parse-connection-spec-selftests.o
  CXX    unittests/ptid-selftests.o
  CXX    unittests/rsp-low-selftests.o
  CXX    unittests/scoped_fd-selftests.o
  CXX    unittests/scoped_mmap-selftests.o
  CXX    unittests/scoped_restore-selftests.o
  CXX    unittests/string_view-selftests.o
  CXX    unittests/style-selftests.o
  CXX    unittests/tracepoint-selftests.o
  CXX    unittests/tui-selftests.o
  CXX    unittests/unpack-selftests.o
In file included from ../../binutils-gdb/gdb/tui/tui-winsource.h:25,
                 from ../../binutils-gdb/gdb/unittests/tui-selftests.c:22:
../../binutils-gdb/gdb/tui/tui-data.h:42:20: error: 'WINDOW' has not been declared
   42 |   void operator() (WINDOW *win) const
      |                    ^~~~~~
../../binutils-gdb/gdb/tui/tui-data.h: In member function 'void curses_deleter::operator()(int*) const':
../../binutils-gdb/gdb/tui/tui-data.h:44:5: error: 'delwin' was not declared in this scope
   44 |     delwin (win);
      |     ^~~~~~
../../binutils-gdb/gdb/tui/tui-data.h: At global scope:
../../binutils-gdb/gdb/tui/tui-data.h:97:19: error: 'WINDOW' was not declared in this scope
   97 |   std::unique_ptr<WINDOW, curses_deleter> handle;
      |                   ^~~~~~
../../binutils-gdb/gdb/tui/tui-data.h:97:41: error: template argument 1 is invalid
   97 |   std::unique_ptr<WINDOW, curses_deleter> handle;
      |                                         ^
../../binutils-gdb/gdb/tui/tui-data.h: In member function 'bool tui_gen_win_info::is_visible() const':
../../binutils-gdb/gdb/tui/tui-data.h:93:19: error: invalid operands of types 'const int' and 'std::nullptr_t' to binary 'operator!='
   93 |     return handle != nullptr;
      |            ~~~~~~~^~~~~~~~~~
make[2]: *** [Makefile:1655: unittests/tui-selftests.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory '/home/gdb-buildbot/fedora-x86-64-1/fedora-x86-64-mingw32/build/gdb'
make[1]: *** [Makefile:8917: all-gdb] Error 2
make[1]: Leaving directory '/home/gdb-buildbot/fedora-x86-64-1/fedora-x86-64-mingw32/build'
make: *** [Makefile:859: all] Error 2
program finished with exit code 2
elapsedTime=433.182260
==============================================

Failures on Fedora-x86_64-native-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-gdbserver-m32

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/24/builds/1406

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128/

*** Diff to previous build ***
==============================================
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.table.gz>

Failures on Fedora-x86_64-native-gdbserver-m64, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-gdbserver-m64

Worker:
        fedora-x86-64-2

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/22/builds/1409

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128/

*** Diff to previous build ***
==============================================
PASS -> FAIL: gdb.threads/process-dies-while-detaching.exp: single-process: continue: watchpoint: continue
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=0: inferior 1 exited
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.table.gz>

Failures on Fedora-x86_64-native-extended-gdbserver-m64, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-extended-gdbserver-m64

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/2/builds/1411

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        517d261dfafb7e5317b841b01ab853a76deb8128

Subject of commit:
        Fix latent bug in tui_copy_source_line

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128/

*** Diff to previous build ***
==============================================
PASS -> UNRESOLVED: gdb.threads/attach-into-signal.exp: threaded: attach
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m64/51/517d261dfafb7e5317b841b01ab853a76deb8128//xfail.table.gz>