X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-util.c;h=44f6e4a863b1df1f4f2bef99b5fb762fbb327e8c;hb=acd42fae59096d84e78f1c17bfcc0d8f96486341;hp=62b7e56c05c7e463663f0302c4105055746fa3ba;hpb=090be8653471e1abe3f1cdd32eaad0fbd65f85cd;p=elogind.git diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index 62b7e56c0..44f6e4a86 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -568,7 +568,7 @@ err: * Murmurhash is under the MIT license. * */ -static unsigned int murmur_hash2(const char *key, int len, unsigned int seed) +static unsigned int murmur_hash2(const char *key, size_t len, unsigned int seed) { /* * 'm' and 'r' are mixing constants generated offline. @@ -583,17 +583,18 @@ static unsigned int murmur_hash2(const char *key, int len, unsigned int seed) /* mix 4 bytes at a time into the hash */ const unsigned char * data = (const unsigned char *)key; - while(len >= 4) { - unsigned int k = *(unsigned int *)data; + while(len >= sizeof(unsigned int)) { + unsigned int k; + memcpy(&k, data, sizeof(k)); k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; - data += 4; - len -= 4; + data += sizeof(k); + len -= sizeof(k); } /* handle the last few bytes of the input array */