summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-07-10 16:34:44 +0200
committerThomas Haller <thaller@redhat.com>2017-07-10 21:55:00 +0200
commit930da031b2e8ed81e324cc2b9e9c76090ce7b8aa (patch)
treeb980f0b70ad7173281295e6181e22097b8817efc
parent67bc29bed1d37e0c1e3db806f37db382d7623163 (diff)
downloadNetworkManager-930da031b2e8ed81e324cc2b9e9c76090ce7b8aa.tar.gz
core: fix NMDedupMultiIndex's _dict_idx_entries_hash()
Don't overwrite @h. Fixes: f9202c2ac120152f047845f859bac22759e634f3
-rw-r--r--shared/nm-utils/nm-dedup-multi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c
index 92dba89936..9e26065b39 100644
--- a/shared/nm-utils/nm-dedup-multi.c
+++ b/shared/nm-utils/nm-dedup-multi.c
@@ -174,10 +174,9 @@ _dict_idx_entries_hash (const NMDedupMultiEntry *entry)
h = 1914869417;
if (!lookup_head)
- h = idx_type->klass->idx_obj_id_hash (idx_type, obj);
+ h = NM_HASH_COMBINE (h, idx_type->klass->idx_obj_id_hash (idx_type, obj));
h = NM_HASH_COMBINE (h, GPOINTER_TO_UINT (idx_type));
- h = NM_HASH_COMBINE (h, lookup_head);
return h;
}