projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update changelog
[awesomized/libmemcached]
/
libmemcached
/
memcached_hash.c
diff --git
a/libmemcached/memcached_hash.c
b/libmemcached/memcached_hash.c
index 5d73611c7ca9ac47a672afb43a1562c82bc1f8d1..e3249c0624774f0d2b343a27e719153e36dd0a45 100644
(file)
--- a/
libmemcached/memcached_hash.c
+++ b/
libmemcached/memcached_hash.c
@@
-2,8
+2,8
@@
/* Defines */
/* Defines */
-static uint64_t FNV_64_INIT=
0xcbf29ce484222325LL
;
-static uint64_t FNV_64_PRIME=
0x100000001b3LL
;
+static uint64_t FNV_64_INIT=
UINT64_C(0xcbf29ce484222325)
;
+static uint64_t FNV_64_PRIME=
UINT64_C(0x100000001b3)
;
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
@@
-143,7
+143,6
@@
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
right= begin;
return right->index;
}
right= begin;
return right->index;
}
- break;
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
@@
-171,12
+170,15
@@
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
{
if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
{
- int temp_len= ptr->prefix_key_length + key_length;
- char *temp= (char *)malloc(temp_len);
+ size_t temp_length= ptr->prefix_key_length + key_length;
+ char temp[temp_length];
+
+ if (temp_length > MEMCACHED_MAX_KEY -1)
+ return 0;
+
strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
strncpy(temp + ptr->prefix_key_length, key, key_length);
strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
strncpy(temp + ptr->prefix_key_length, key, key_length);
- hash= generate_hash(ptr, temp, temp_len);
- free(temp);
+ hash= generate_hash(ptr, temp, temp_length);
}
else
{
}
else
{