client: fix NULL dereference with no connections
authorLubomir Rintel <lkundrak@v3.sk>
Thu, 4 Feb 2016 15:47:00 +0000 (16:47 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Thu, 11 Feb 2016 16:01:03 +0000 (17:01 +0100)
Coverity complains:

CID 59386 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking cons suggests that it may be null, but it has
already been dereferenced on all paths leading to the check.

clients/cli/connections.c

index 33e6b5d..44f7d8b 100644 (file)
@@ -1532,11 +1532,14 @@ sort_connections (const GPtrArray *cons, NmCli *nmc, const GArray *order)
        int i;
        NmcSortInfo compare_info;
 
+       if (!cons)
+               return;
+
        compare_info.nmc = nmc;
        compare_info.order = order;
 
        sorted = g_ptr_array_sized_new (cons->len);
-       for (i = 0; cons && i < cons->len; i++)
+       for (i = 0; i < cons->len; i++)
                g_ptr_array_add (sorted, cons->pdata[i]);
        g_ptr_array_sort_with_data (sorted, compare_connections, &compare_info);
        return sorted;