diff options
| author | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
| commit | 665270502c3d7c0d002ad76fefb1b7699794cd49 (patch) | |
| tree | 9bc6f4f79278c2a719e1839188f763655a6370ca /src/nm-ip4-config.c | |
| parent | 3192a21b21d4a9d276a7f2ef4e4b0fcf3165d9eb (diff) | |
| parent | 5c79b900b59a5ad162ecc836e424468207ff031e (diff) | |
Update upstream source from tag 'upstream/1.20.0'
Update to upstream version '1.20.0' with Debian dir 832bc2b5ac5f253004165f6354c938efbe172206
Diffstat (limited to 'src/nm-ip4-config.c')
| -rw-r--r-- | src/nm-ip4-config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 86c82925..36e75bb2 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -544,6 +544,9 @@ _addresses_sort_cmp (gconstpointer a, gconstpointer b, gpointer user_data) const NMPlatformIP4Address *a2 = NMP_OBJECT_CAST_IP4_ADDRESS (*((const NMPObject **) b)); guint32 n1, n2; + nm_assert (a1); + nm_assert (a2); + /* Sort by address type. For example link local will * be sorted *after* a global address. */ p1 = _addresses_sort_cmp_get_prio (a1->address); @@ -577,6 +580,9 @@ sort_captured_addresses (const CList *lst_a, const CList *lst_b, gconstpointer u const NMPlatformIP4Address *addr_a = NMP_OBJECT_CAST_IP4_ADDRESS (c_list_entry (lst_a, NMDedupMultiEntry, lst_entries)->obj); const NMPlatformIP4Address *addr_b = NMP_OBJECT_CAST_IP4_ADDRESS (c_list_entry (lst_b, NMDedupMultiEntry, lst_entries)->obj); + nm_assert (addr_a); + nm_assert (addr_b); + /* Primary addresses first */ return NM_FLAGS_HAS (addr_a->n_ifa_flags, IFA_F_SECONDARY) - NM_FLAGS_HAS (addr_b->n_ifa_flags, IFA_F_SECONDARY); |