summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Warner <james.warner@comcast.net>2011-12-05 14:10:41 -0600
committerCraig Small <csmall@enc.com.au>2011-12-06 08:51:15 +1100
commit41ed28aa5d2344e4838504a878a4db0afff8a6d8 (patch)
treea46fcd82834f05faa55f04581c9689a57bffcab4
parent497428d7700aa707555b4745c4c58d3c50968a93 (diff)
downloadprocps-ng-41ed28aa5d2344e4838504a878a4db0afff8a6d8.tar.gz
top: avoid potential forest view segmentation fault
-rw-r--r--top.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/top.c b/top.c
index c22d4f0..cfd0655 100644
--- a/top.c
+++ b/top.c
@@ -3136,7 +3136,10 @@ static void forest_create (WIN_t *q) {
Tree_ppt = alloc_r(Tree_ppt, sizeof(proc_t*) * hwmsav);
}
while (0 == Seed_ppt[i]->ppid) // identify trees (expect 2)
- forest_add(i++, 0); // add parent plus children
+ forest_add(i++, 1); // add parent plus children
+ for (i = 0; i < Frame_maxtask; i++) // finally, protect ourselves
+ if (!Seed_ppt[i]->pad_3) // against any kernel anomaly
+ Tree_ppt[Tree_idx++] = Seed_ppt[i];
}
memcpy(Seed_ppt, Tree_ppt, sizeof(proc_t*) * Frame_maxtask);
} // end: forest_create
@@ -3149,8 +3152,9 @@ static inline const char *forest_display (const WIN_t *q, const proc_t *p) {
static char buf[ROWMINSIZ];
const char *which = (CHKw(q, Show_CMDLIN)) ? *p->cmdline : p->cmd;
- if (!CHKw(q, Show_FOREST) || !p->pad_3) return which;
- snprintf(buf, sizeof(buf), "%*s%s", 4 * p->pad_3, " `- ", which);
+ if (!CHKw(q, Show_FOREST) || 1 == p->pad_3) return which;
+ if (!p->pad_3) snprintf(buf, sizeof(buf), " ? %s", which);
+ else snprintf(buf, sizeof(buf), "%*s%s", 4 * (p->pad_3 - 1), " `- ", which);
return buf;
} // end: forest_display