summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-bus
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-10-04 01:59:06 +0200
committerTom Gundersen <teg@jklm.no>2015-10-05 19:21:02 +0200
commit1e2527a6fede996a429bd44b30a15e76ee293437 (patch)
tree3cfdbc2314a6b3c26b63807e5575dac906734942 /src/libsystemd/sd-bus
parentb826ab586c9e0a9c0d438a75c28cf3a8ab485929 (diff)
hashmap: hash_funcs - make inputs unambiguous
Make sure all variable-length inputs are properly terminated or that their length is encoded in some way. This avoids ambiguity of adjacent inputs. E.g., in case of a hash function taking two strings, compressing "ab" followed by "c" is now distinct from "a" followed by "bc".
Diffstat (limited to 'src/libsystemd/sd-bus')
-rw-r--r--src/libsystemd/sd-bus/busctl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 496b9a7b4e..49c97af339 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -630,12 +630,17 @@ typedef struct Member {
static void member_hash_func(const void *p, struct siphash *state) {
const Member *m = p;
+ uint64_t arity = 1;
assert(m);
assert(m->type);
string_hash_func(m->type, state);
+ arity += !!m->name + !!m->interface;
+
+ uint64_hash_func(&arity, state);
+
if (m->name)
string_hash_func(m->name, state);