emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

0115-top: Harden calibrate_fields().

Browse Source 
- Make sure i is at least 1 before "i - 1" and "--i".

- Initialize endpflg (to 0, as it was originally, since it is static)
  before the "for" loop (the "break" may leave endpflg uninitialized,
  for example).
This commit is contained in:
Qualys Security Advisory - committed by Craig Small
parent 6024543e79
commit 2ba9c569e5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
top/top.c
View File

@ -1963,7 +1963,7 @@ static void calibrate_fields (void) {
s = scat(s, fmtmk("%*.*s", len, len, h)); s = scat(s, fmtmk("%*.*s", len, len, h));
} }
#ifndef USE_X_COLHDR #ifndef USE_X_COLHDR
if (EU_XON == w->procflgs[i - 1]) --i; if (i >= 1 && EU_XON == w->procflgs[i - 1]) --i;
#endif #endif
/* establish the final maxpflgs and prepare to grow the variable column /* establish the final maxpflgs and prepare to grow the variable column
@ -1977,6 +1977,7 @@ static void calibrate_fields (void) {
fit within screen width, including a leading window number */ fit within screen width, including a leading window number */
*(s = w->columnhdr) = '\0'; *(s = w->columnhdr) = '\0';
if (Rc.mode_altscr) s = scat(s, " "); if (Rc.mode_altscr) s = scat(s, " ");
w->endpflg = 0;
for (i = w->totpflgs - 1; -1 < i; i--) { for (i = w->totpflgs - 1; -1 < i; i--) {
f = w->pflgsall[i]; f = w->pflgsall[i];
#ifndef USE_X_COLHDR #ifndef USE_X_COLHDR