d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the first couple of AddressSanitizer violations in usr.bin/top.

Browse Source 
Avoid setting zero bytes beyond the length of the 'thisline' parameters
in i_process() and u_process(), and don't attempt to memset a negative
number of bytes.

MFC after:	1 week
This commit is contained in:
Dimitry Andric 2019-02-10 13:44:36 +00:00
parent 2f301637c8
commit 7362ea6db0
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/top/display.c
View File

@ -829,7 +829,11 @@ i_process(int line, char *thisline)
}
/* truncate the line to conform to our current screen width */
thisline[screen_width] = '\0';
int len = strlen(thisline);
if (screen_width < len)
{
thisline[screen_width] = '\0';
}
/* write the line out */
fputs(thisline, stdout);
@ -839,7 +843,10 @@ i_process(int line, char *thisline)
p = stpcpy(base, thisline);
/* zero fill the rest of it */
memset(p, 0, screen_width - (p - base));
if (p - base < screen_width)
{
memset(p, 0, screen_width - (p - base));
}
}
void
@ -853,7 +860,11 @@ u_process(int line, char *newline)
bufferline = &screenbuf[lineindex(line)];
/* truncate the line to conform to our current screen width */
newline[screen_width] = '\0';
int len = strlen(newline);
if (screen_width < len)
{
newline[screen_width] = '\0';
}
/* is line higher than we went on the last display? */
if (line >= last_hi)
@ -878,7 +889,10 @@ u_process(int line, char *newline)
optr = stpcpy(bufferline, newline);
/* zero fill the rest of it */
memset(optr, 0, screen_width - (optr - bufferline));
if (optr - bufferline < screen_width)
{
memset(optr, 0, screen_width - (optr - bufferline));
}
}
else
{