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

Fix undefined behavior in TUI's TAB expansion 

gdb/ChangeLog:

	* tui/tui-io.c (tui_expand_tabs): Reinitialize the column counter
	before the second loop, to avoid undefined behavior.  Reported by
	Anton Blanchard <anton@samba.org>.
This commit is contained in:
Eli Zaretskii 2015-03-21 10:48:34 +02:00
parent 5da7e675cd
commit b1a0f70495
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2015-03-21 Eli Zaretskii <eliz@gnu.org>
* tui/tui-io.c (tui_expand_tabs): Reinitialize the column counter
before the second loop, to avoid undefined behavior. Reported by
Anton Blanchard <anton@samba.org>.
2015-03-20 Keven Boell <keven.boell@intel.com>
* gdbtypes.c (resolve_dynamic_type_internal): Adapt

16
gdb/tui/tui-io.c
View File

@ -668,20 +668,20 @@ tui_getc (FILE *fp)
char *
tui_expand_tabs (const char *string, int col)
{
int n_adjust;
int n_adjust, ncol;
const char *s;
char *ret, *q;
/* 1. How many additional characters do we need? */
for (n_adjust = 0, s = string; s; )
for (ncol = col, n_adjust = 0, s = string; s; )
{
s = strpbrk (s, "\t");
if (s)
{
col += (s - string) + n_adjust;
ncol += (s - string) + n_adjust;
/* Adjustment for the next tab stop, minus one for the TAB
we replace with spaces. */
n_adjust += 8 - (col % 8) - 1;
n_adjust += 8 - (ncol % 8) - 1;
s++;
}
}
@ -690,7 +690,7 @@ tui_expand_tabs (const char *string, int col)
ret = q = xmalloc (strlen (string) + n_adjust + 1);
/* 2. Copy the original string while replacing TABs with spaces. */
for (s = string; s; )
for (ncol = col, s = string; s; )
{
const char *s1 = strpbrk (s, "\t");
if (s1)
@ -699,12 +699,12 @@ tui_expand_tabs (const char *string, int col)
{
strncpy (q, s, s1 - s);
q += s1 - s;
col += s1 - s;
ncol += s1 - s;
}
do {
*q++ = ' ';
col++;
} while ((col % 8) != 0);
ncol++;
} while ((ncol % 8) != 0);
s1++;
}
else