OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tom Tromey 2019-04-09 12:52:46 -06:00
parent ee3c5f8968
commit 62160ec954
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -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> 2019-04-19 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* cli/cli-cmds.c (_initialize_cli_cmds): Move "shell" "!" alias * cli/cli-cmds.c (_initialize_cli_cmds): Move "shell" "!" alias

6
gdb/source.c
View File

@ -1368,7 +1368,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
char c = *iter; char c = *iter;
if (c == '\033' && skip_ansi_escape (iter, &skip_bytes)) if (c == '\033' && skip_ansi_escape (iter, &skip_bytes))
iter += skip_bytes; iter += skip_bytes;
else if (c < 040 && c != '\t') else if (c >= 0 && c < 040 && c != '\t')
break; break;
else if (c == 0177) else if (c == 0177)
break; break;
@ -1397,9 +1397,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
{ {
xsnprintf (buf, sizeof (buf), "^%c", *iter + 0100); xsnprintf (buf, sizeof (buf), "^%c", *iter + 0100);
uiout->text (buf); uiout->text (buf);
++iter;
} }
else if (*iter == 0177) else if (*iter == 0177)
{
uiout->text ("^?"); uiout->text ("^?");
++iter;
}
} }
uiout->text ("\n"); uiout->text ("\n");
} }

5
gdb/testsuite/ChangeLog
View File

@ -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> 2019-04-18 Tom de Vries <tdevries@suse.de>
PR gdb/24433 PR gdb/24433

2
gdb/testsuite/gdb.base/list0.h
View File

@ -3,7 +3,7 @@
extern void bar(int); extern void bar(int);
static void foo (int x) static void foo (int x)
/* ! /* !
!
! */ ! */
{ {
bar (x++); bar (x++);