You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.0 KiB
32 lines
1.0 KiB
7 years ago
|
From 33088d83ecaf03611e3d20a893e675e4d7c3ae9a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
|
||
|
|
Date: Wed, 11 Mar 2015 11:24:18 +0100
|
||
|
|
Subject: [PATCH] cgtop: fix assert when not on tty
|
||
|
|
|
||
|
|
systemd-cgtop --dept=1 -b -n 10 -d 0.1 | cat
|
||
|
|
|
||
|
|
Assertion 'new_length >= 3' failed at src/shared/util.c:3 \
|
||
|
|
595, function ellipsize_mem(). Aborting.
|
||
|
|
Aborted (core dumped)
|
||
|
|
|
||
|
|
(David: add comment)
|
||
|
|
|
||
|
|
(cherry picked from commit 510c4a0f1e7e7efe2897d2fbb9067f121467b103)
|
||
|
|
---
|
||
|
|
src/cgtop/cgtop.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
|
||
|
|
index 3c7ad4060..f951c37cb 100644
|
||
|
|
--- a/src/cgtop/cgtop.c
|
||
|
|
+++ b/src/cgtop/cgtop.c
|
||
|
|
@@ -447,7 +447,7 @@ static int display(Hashmap *a) {
|
||
|
|
Group *g;
|
||
|
|
Group **array;
|
||
|
|
signed path_columns;
|
||
|
|
- unsigned rows, n = 0, j, maxtcpu = 0, maxtpath = 0;
|
||
|
|
+ unsigned rows, n = 0, j, maxtcpu = 0, maxtpath = 3; /* 3 for ellipsize() to work properly */
|
||
|
|
char buffer[MAX3(21, FORMAT_BYTES_MAX, FORMAT_TIMESPAN_MAX)];
|
||
|
|
|
||
|
|
assert(a);
|