[PATCH] Fix "list" when control characters are seen

Tom Tromey
2019-04-09T18:54:38Z

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-09 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-09 Tom Tromey <tromey@adacore.com>

PR symtab/24423:
* gdb.base/list0.h (foo): Add a control-l character.
---
gdb/ChangeLog | 6 ++++++
gdb/source.c | 8 ++++++--
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.base/list0.h | 2 +-
4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gdb/source.c b/gdb/source.c
index f99215f9810..b61880ab503 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/gdb.base/list0.h b/gdb/testsuite/gdb.base/list0.h
index 42a4fe0f03a..6f280935509 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)
/* !
- !
+\f
! */
{
bar (x++);
--
2.20.1