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

top: fix potential SEGV when no tasks were displayable

Browse Source 
This patch fixes a nearly decade old bug discovered by
Frederik Deweerdt. His merge request shown below would
be an adequate solution except for iterative overhead.

This alternate patch will represent substantially less
overhead for an admittedly extremely rare possibility.

Reference(s):
https://gitlab.com/procps-ng/procps/-/merge_requests/114

And-thanks-to: Frederik Deweerdt <fdeweerdt@fastly.com>
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2020-09-09 00:00:00 -05:00 committed by Craig Small
parent 08d53ae3e6
commit d3203d99dd
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -13,6 +13,7 @@ procps-ng NEXT
* top: add command line 'e' for symmetry with 'E' issue #165 * top: add command line 'e' for symmetry with 'E' issue #165
* top: add '4' toggle for two abreast cpu display issue #172 * top: add '4' toggle for two abreast cpu display issue #172
* top: add '!' toggle for combining multiple cpus * top: add '!' toggle for combining multiple cpus
* top: fix potential SEGV involving -p switch merge #114
* vmstat: Wide mode gives wider proc columns merge #48 * vmstat: Wide mode gives wider proc columns merge #48
* watch: Add environment variable for interval merge #62 * watch: Add environment variable for interval merge #62

2
top/top.c
View File

@ -6045,6 +6045,8 @@ static int window_show (WIN_t *q, int wmax) {
// Display Column Headings -- and distract 'em while we sort (maybe) // Display Column Headings -- and distract 'em while we sort (maybe)
PUFF("\n%s%s%s", q->capclr_hdr, q->columnhdr, Caps_endline); PUFF("\n%s%s%s", q->capclr_hdr, q->columnhdr, Caps_endline);
// and just in case 'Monpids' is active but matched no processes ...
if (!PIDSmaxt) return 1; // 1 for the column header
if (CHKw(q, Show_FOREST)) if (CHKw(q, Show_FOREST))
forest_begin(q); forest_begin(q);