[systemd-commits] src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/shared/cgroup-show.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a0551d26ab5c6e0d5089b42a6319baef0e28ad92
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Oct 14 19:15:24 2013 -0400

    Fix bad assert in show_pid_array
    
    This function should get the same treatment as other qsort uses
    did in 7ff7394 "Never call qsort on potentially NULL arrays".
    
    Reported-by: Oleksii Shevchuk <alxchk at gmail.com>

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 979fa8f..ce02b76 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -44,8 +44,6 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
         unsigned i, m, pid_width;
         pid_t biggest = 0;
 
-        assert(n_pids > 0);
-
         /* Filter duplicates */
         m = 0;
         for (i = 0; i < n_pids; i++) {
@@ -65,7 +63,7 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
         pid_width = DECIMAL_STR_WIDTH(biggest);
 
         /* And sort */
-        qsort(pids, n_pids, sizeof(pid_t), compare);
+        qsort_safe(pids, n_pids, sizeof(pid_t), compare);
 
         if (flags & OUTPUT_FULL_WIDTH)
                 n_columns = 0;