projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for if NULL is passed as a valid argument to memcached_behavior_set
[m6w6/libmemcached]
/
lib
/
memcached_behavior.c
diff --git
a/lib/memcached_behavior.c
b/lib/memcached_behavior.c
index 853a33b322bcd891bd36cef64b11b94353df875a..8c02a383d7e6b9abe313983d61f643cfcc3a4425 100644
(file)
--- a/
lib/memcached_behavior.c
+++ b/
lib/memcached_behavior.c
@@
-11,9
+11,13
@@
void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, void *data)
{
void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, void *data)
{
- unsigned int *truefalse= (unsigned int *)data;
+ uint8_t truefalse;
+
+ if (data)
+ truefalse= *(unsigned int *)data;
+ else
+ truefalse= 0;
- memcached_quit(ptr);
if (truefalse)
ptr->flags|= temp_flag;
else
if (truefalse)
ptr->flags|= temp_flag;
else
@@
-31,9
+35,14
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
+ memcached_quit(ptr);
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
+ memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
+ memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
ptr->distribution= *(memcached_server_distribution *)(data);
break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
ptr->distribution= *(memcached_server_distribution *)(data);
@@
-43,13
+52,23
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
break;
case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
+ memcached_quit(ptr);
+ break;
+ case MEMCACHED_BEHAVIOR_VERIFY_KEY:
+ set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
+ case MEMCACHED_BEHAVIOR_SORT_HOSTS:
+ set_behavior_flag(ptr, MEM_USE_SORT_HOSTS, data);
+ break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ ptr->user_data= data;
+ break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
-
unsigned int timeout= (*((unsigned in
t *)data));
+
int32_t timeout= (*((int32_
t *)data));
ptr->poll_timeout= timeout;
break;
ptr->poll_timeout= timeout;
break;
@@
-89,9
+108,15
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_NO_BLOCK:
temp_flag= MEM_NO_BLOCK;
break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
temp_flag= MEM_NO_BLOCK;
break;
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ temp_flag= MEM_BUFFER_REQUESTS;
+ break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
+ case MEMCACHED_BEHAVIOR_VERIFY_KEY:
+ temp_flag= MEM_VERIFY_KEY;
+ break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return ptr->distribution;
case MEMCACHED_BEHAVIOR_HASH:
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
return ptr->distribution;
case MEMCACHED_BEHAVIOR_HASH:
@@
-99,6
+124,11
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
+ case MEMCACHED_BEHAVIOR_SORT_HOSTS:
+ temp_flag= MEM_USE_SORT_HOSTS;
+ break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ return 0;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
@@
-108,8
+138,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
int sock_size;
socklen_t sock_length= sizeof(int);
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
/* We just try the first host, and if it is down we return zero */
- if ((memcached_connect(
ptr, 0
)) != MEMCACHED_SUCCESS)
+ if ((memcached_connect(
&ptr->hosts[0]
)) != MEMCACHED_SUCCESS)
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
@@
-123,8
+154,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
int sock_size;
socklen_t sock_length= sizeof(int);
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
/* We just try the first host, and if it is down we return zero */
- if ((memcached_connect(
ptr, 0
)) != MEMCACHED_SUCCESS)
+ if ((memcached_connect(
&ptr->hosts[0]
)) != MEMCACHED_SUCCESS)
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,