diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 17:59:37 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 19:18:52 +0100 |
| commit | 787a18c467c41d1e5bd8ec05af4afc29df63ea3d (patch) | |
| tree | 4c94970e5902190d11d3cceda53ca6693b226a92 /shared/systemd/src/basic/hashmap.c | |
| parent | 209ff015e26f295bdb7c396962a4e9b4199398fb (diff) | |
| parent | 62e6df1f1cd2b3588086dabd38172a30d1253901 (diff) | |
| download | NetworkManager-bg/systemd.tar.gz | |
systemd: merge branch systemd into masterbg/systemd
Diffstat (limited to 'shared/systemd/src/basic/hashmap.c')
| -rw-r--r-- | shared/systemd/src/basic/hashmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shared/systemd/src/basic/hashmap.c b/shared/systemd/src/basic/hashmap.c index 9cb2f94865..c06558316e 100644 --- a/shared/systemd/src/basic/hashmap.c +++ b/shared/systemd/src/basic/hashmap.c @@ -1518,8 +1518,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; |