From: Thomas Haller <thaller@redhat.com>
Date: Mon, 4 Feb 2019 08:36:17 +0000 (+0100)
Subject: hashmap: always set key output argument of internal_hashmap_first_key_and_value()
X-Git-Tag: v241~19^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51c682df38fa032599c6c0e4556136c7d6d7c504;p=platform%2Fupstream%2Fsystemd.git

hashmap: always set key output argument of internal_hashmap_first_key_and_value()

internal_hashmap_first_key_and_value() returns the first value, or %NULL
if the hashmap is empty.

However, hashmaps may contain %NULL values. That means, a caller getting
%NULL doesn't know whether the hashmap is empty or whether the first
value is %NULL.

For example, a caller may be tempted to do something like:

    if ((val = hashmap_steal_first_key_and_value (h, (void **) key))) {
         // process first entry.
    }

But this is only correct if the caller made sure that the hash is either
not empty or contains no NULL values.

Anyway, since a %NULL return value can signal an empty hash or a %NULL
value, it seems error prone to leave the key output argument
uninitialized in situations that the caller cannot clearly distinguish
(without making additional assumptions).
---

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 80fec8f..66e9e00 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1516,8 +1516,11 @@ void *internal_hashmap_first_key_and_value(HashmapBase *h, bool remove, void **r
         unsigned idx;
 
         idx = find_first_entry(h);
-        if (idx == IDX_NIL)
+        if (idx == IDX_NIL) {
+                if (ret_key)
+                        *ret_key = NULL;
                 return NULL;
+        }
 
         e = bucket_at(h, idx);
         key = (void*) e->key;