From: Karel Zak <kzak@redhat.com>
Date: Fri, 5 May 2017 09:31:47 +0000 (+0200)
Subject: column: fix --tree id-parent loop crash
X-Git-Tag: v2.30-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f00a9471b7b92b2f8680898676bb5479b97d97;p=thirdparty%2Futil-linux.git

column: fix --tree id-parent loop crash

The loop is silently ignored.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/column.c b/text-utils/column.c
index 7070862448..7d6a8dcb6e 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -329,7 +329,11 @@ static void create_tree(struct column_control *ctl)
 
 			if (!parent)
 				continue;
-			if (strcmp(id, parent) == 0 && ln_i != ln)
+			if (scols_line_get_parent(ln_i) == ln)
+				continue;
+			if ( ln_i == ln)
+				continue;
+			if (strcmp(id, parent) == 0)
 				scols_line_add_child(ln_i, ln);
 		}
 	}