projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all changes related to being able to read configuration files.
[awesomized/libmemcached]
/
libmemcached
/
stats.c
diff --git
a/libmemcached/stats.c
b/libmemcached/stats.c
index 0c52d97a6b4fbe8c9f1b6367dcca796b8b7c2a16..ebbc63ab9b8ba05be502160ccfb82886e3f5052b 100644
(file)
--- a/
libmemcached/stats.c
+++ b/
libmemcached/stats.c
@@
-162,7
+162,8
@@
static memcached_return_t set_data(memcached_stat_st *memc_stat, char *key, char
strcmp("reclaimed", key) == 0))
{
WATCHPOINT_STRING(key);
strcmp("reclaimed", key) == 0))
{
WATCHPOINT_STRING(key);
- return MEMCACHED_UNKNOWN_STAT_KEY;
+ /* return MEMCACHED_UNKNOWN_STAT_KEY; */
+ return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-227,6
+228,12
@@
char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
return NULL;
}
return NULL;
}
+ if (length >= SMALL_STRING_LEN || length < 0)
+ {
+ *error= MEMCACHED_FAILURE;
+ return NULL;
+ }
+
ret= libmemcached_malloc(ptr, (size_t) (length + 1));
memcpy(ret, buffer, (size_t) length);
ret[length]= '\0';
ret= libmemcached_malloc(ptr, (size_t) (length + 1));
memcpy(ret, buffer, (size_t) length);
ret[length]= '\0';
@@
-329,7
+336,7
@@
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
{
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
{
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-
size_
t send_length;
+
in
t send_length;
if (args)
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
if (args)
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-338,10
+345,10
@@
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"stats\r\n");
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"stats\r\n");
- if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE
|| send_length < 0
)
return MEMCACHED_WRITE_FAILURE;
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(instance, buffer, send_length, true);
+ rc= memcached_do(instance, buffer,
(size_t)
send_length, true);
if (rc != MEMCACHED_SUCCESS)
goto error;
if (rc != MEMCACHED_SUCCESS)
goto error;
@@
-398,9
+405,20
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
memcached_return_t rc;
memcached_stat_st *stats;
memcached_return_t rc;
memcached_stat_st *stats;
+ if (! ptr)
+ {
+ WATCHPOINT_ASSERT(memc_ptr);
+ return NULL;
+ }
+
+ WATCHPOINT_ASSERT(error);
+
+
unlikely (ptr->flags.use_udp)
{
unlikely (ptr->flags.use_udp)
{
- *error= MEMCACHED_NOT_SUPPORTED;
+ if (error)
+ *error= MEMCACHED_NOT_SUPPORTED;
+
return NULL;
}
return NULL;
}
@@
-408,7
+426,9
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
if (! stats)
{
if (! stats)
{
- *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+ if (error)
+ *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
return NULL;
}
return NULL;
}
@@
-438,7
+458,9
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
rc= MEMCACHED_SOME_ERRORS;
}
rc= MEMCACHED_SOME_ERRORS;
}
- *error= rc;
+ if (error)
+ *error= rc;
+
return stats;
}
return stats;
}