]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
column: fix --tree id-parent loop crash
authorKarel Zak <kzak@redhat.com>
Fri, 5 May 2017 09:31:47 +0000 (11:31 +0200)
committerKarel Zak <kzak@redhat.com>
Fri, 5 May 2017 09:31:47 +0000 (11:31 +0200)
The loop is silently ignored.

Signed-off-by: Karel Zak <kzak@redhat.com>
text-utils/column.c

index 7070862448c0b78b24be91d3425372b005da1e0f..7d6a8dcb6e172f511d252fec03ab5df037f47e8d 100644 (file)
@@ -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);
                }
        }