diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-04-09 12:52:46 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-04-19 13:01:54 -0600 |
| commit | 62160ec9547cdd21ac7334d9a378ca2930aac61c (patch) | |
| tree | 55873c12bd4acb1b1f7434524a1a2c0d10c3dc49 /gdb | |
| parent | ee3c5f8968e7b43854204898fa46933b3a1b5991 (diff) | |
| download | gdb-62160ec9547cdd21ac7334d9a378ca2930aac61c.zip gdb-62160ec9547cdd21ac7334d9a378ca2930aac61c.tar.gz gdb-62160ec9547cdd21ac7334d9a378ca2930aac61c.tar.bz2 | |
Fix "list" when control characters are seen
PR symtab/24423 points out that control characters in a source file
cause a hang in the "list" command, a regression introduced by the
styling changes.
This patch, from the PR, fixes the bug. I've included a minimal
change to the "list" test that exercises this code.
I recall that this bug was discussed on gdb-patches, and I thought
there was a patch there as well, but I was unable to find it.
gdb/ChangeLog
2019-04-19 Ilya Yu. Malakhov <malakhov@mcst.ru>
PR symtab/24423:
* source.c (print_source_lines_base): Advance "iter" when a
control character is seen.
gdb/testsuite/ChangeLog
2019-04-19 Tom Tromey <tromey@adacore.com>
PR symtab/24423:
* gdb.base/list0.h (foo): Add a control-l character.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/source.c | 8 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/list0.h | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab65671..22f22b9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-04-19 Ilya Yu. Malakhov <malakhov@mcst.ru> + + PR symtab/24423: + * source.c (print_source_lines_base): Advance "iter" when a + control character is seen. + 2019-04-19 Philippe Waroquiers <philippe.waroquiers@skynet.be> * cli/cli-cmds.c (_initialize_cli_cmds): Move "shell" "!" alias diff --git a/gdb/source.c b/gdb/source.c index f99215f..b61880a 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1368,7 +1368,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, char c = *iter; if (c == '\033' && skip_ansi_escape (iter, &skip_bytes)) iter += skip_bytes; - else if (c < 040 && c != '\t') + else if (c >= 0 && c < 040 && c != '\t') break; else if (c == 0177) break; @@ -1397,9 +1397,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline, { xsnprintf (buf, sizeof (buf), "^%c", *iter + 0100); uiout->text (buf); + ++iter; } else if (*iter == 0177) - uiout->text ("^?"); + { + uiout->text ("^?"); + ++iter; + } } uiout->text ("\n"); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 297e2d4..89058f4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-19 Tom Tromey <tromey@adacore.com> + + PR symtab/24423: + * gdb.base/list0.h (foo): Add a control-l character. + 2019-04-18 Tom de Vries <tdevries@suse.de> PR gdb/24433 diff --git a/gdb/testsuite/gdb.base/list0.h b/gdb/testsuite/gdb.base/list0.h index 42a4fe0..6f28093 100644 --- a/gdb/testsuite/gdb.base/list0.h +++ b/gdb/testsuite/gdb.base/list0.h @@ -3,7 +3,7 @@ extern void bar(int); static void foo (int x) /* ! - ! + ! */ { bar (x++); |