X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstats.c;h=83d342a1f096559cc66d5a66be5e124415783d7c;hb=259ed7e68a0de0887e9aedbe0aa5fdd9404929f9;hp=0c52d97a6b4fbe8c9f1b6367dcca796b8b7c2a16;hpb=3fca91c00a13fa7d6650bfe65aabf074fa5579b5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/stats.c b/libmemcached/stats.c
index 0c52d97a..83d342a1 100644
--- 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);
-    return MEMCACHED_UNKNOWN_STAT_KEY;
+    /* return MEMCACHED_UNKNOWN_STAT_KEY; */
+    return MEMCACHED_SUCCESS;
   }
 
   return MEMCACHED_SUCCESS;
@@ -177,49 +178,49 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
 
   *error= MEMCACHED_SUCCESS;
 
-  if (!memcmp("pid", key, strlen("pid")))
+  if (!memcmp("pid", key, sizeof("pid") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->pid);
-  else if (!memcmp("uptime", key, strlen("uptime")))
+  else if (!memcmp("uptime", key, sizeof("uptime") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->uptime);
-  else if (!memcmp("time", key, strlen("time")))
+  else if (!memcmp("time", key, sizeof("time") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->time);
-  else if (!memcmp("version", key, strlen("version")))
+  else if (!memcmp("version", key, sizeof("version") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%s", memc_stat->version);
-  else if (!memcmp("pointer_size", key, strlen("pointer_size")))
+  else if (!memcmp("pointer_size", key, sizeof("pointer_size") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->pointer_size);
-  else if (!memcmp("rusage_user", key, strlen("rusage_user")))
+  else if (!memcmp("rusage_user", key, sizeof("rusage_user") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", memc_stat->rusage_user_seconds, memc_stat->rusage_user_microseconds);
-  else if (!memcmp("rusage_system", key, strlen("rusage_system")))
+  else if (!memcmp("rusage_system", key, sizeof("rusage_system") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u.%u", memc_stat->rusage_system_seconds, memc_stat->rusage_system_microseconds);
-  else if (!memcmp("curr_items", key, strlen("curr_items")))
+  else if (!memcmp("curr_items", key, sizeof("curr_items") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->curr_items);
-  else if (!memcmp("total_items", key, strlen("total_items")))
+  else if (!memcmp("total_items", key, sizeof("total_items") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->total_items);
-  else if (!memcmp("curr_connections", key, strlen("curr_connections")))
+  else if (!memcmp("curr_connections", key, sizeof("curr_connections") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->curr_connections);
-  else if (!memcmp("total_connections", key, strlen("total_connections")))
+  else if (!memcmp("total_connections", key, sizeof("total_connections") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->total_connections);
-  else if (!memcmp("connection_structures", key, strlen("connection_structures")))
+  else if (!memcmp("connection_structures", key, sizeof("connection_structures") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->connection_structures);
-  else if (!memcmp("cmd_get", key, strlen("cmd_get")))
+  else if (!memcmp("cmd_get", key, sizeof("cmd_get") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->cmd_get);
-  else if (!memcmp("cmd_set", key, strlen("cmd_set")))
+  else if (!memcmp("cmd_set", key, sizeof("cmd_set") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->cmd_set);
-  else if (!memcmp("get_hits", key, strlen("get_hits")))
+  else if (!memcmp("get_hits", key, sizeof("get_hits") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->get_hits);
-  else if (!memcmp("get_misses", key, strlen("get_misses")))
+  else if (!memcmp("get_misses", key, sizeof("get_misses") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->get_misses);
-  else if (!memcmp("evictions", key, strlen("evictions")))
+  else if (!memcmp("evictions", key, sizeof("evictions") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->evictions);
-  else if (!memcmp("bytes_read", key, strlen("bytes_read")))
+  else if (!memcmp("bytes_read", key, sizeof("bytes_read") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes_read);
-  else if (!memcmp("bytes_written", key, strlen("bytes_written")))
+  else if (!memcmp("bytes_written", key, sizeof("bytes_written") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes_written);
-  else if (!memcmp("bytes", key, strlen("bytes")))
+  else if (!memcmp("bytes", key, sizeof("bytes") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->bytes);
-  else if (!memcmp("limit_maxbytes", key, strlen("limit_maxbytes")))
+  else if (!memcmp("limit_maxbytes", key, sizeof("limit_maxbytes") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%llu", (unsigned long long)memc_stat->limit_maxbytes);
-  else if (!memcmp("threads", key, strlen("threads")))
+  else if (! memcmp("threads", key, sizeof("threads") -1))
     length= snprintf(buffer, SMALL_STRING_LEN,"%u", memc_stat->threads);
   else
   {
@@ -227,6 +228,12 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
     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';
@@ -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];
-  size_t send_length;
+  int send_length;
 
   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");
 
-  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
     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;
 
@@ -393,27 +400,40 @@ error:
     return rc;
 }
 
-memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error)
+memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_return_t *error)
 {
   memcached_return_t rc;
   memcached_stat_st *stats;
 
-  unlikely (ptr->flags.use_udp)
+  if (! self)
+  {
+    WATCHPOINT_ASSERT(self);
+    return NULL;
+  }
+
+  WATCHPOINT_ASSERT(error);
+
+
+  unlikely (self->flags.use_udp)
   {
-    *error= MEMCACHED_NOT_SUPPORTED;
+    if (error)
+      *error= MEMCACHED_NOT_SUPPORTED;
+
     return NULL;
   }
 
-  stats= libmemcached_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
+  stats= libmemcached_calloc(self, memcached_server_count(self), sizeof(memcached_stat_st));
 
   if (! stats)
   {
-    *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    if (error)
+      *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
     return NULL;
   }
 
   rc= MEMCACHED_SUCCESS;
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(self); x++)
   {
     memcached_return_t temp_return;
     memcached_server_write_instance_st instance;
@@ -421,11 +441,11 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
 
     stat_instance= stats + x;
 
-    stat_instance->root= ptr;
+    stat_instance->root= self;
 
-    instance= memcached_server_instance_fetch(ptr, x);
+    instance= memcached_server_instance_fetch(self, x);
 
-    if (ptr->flags.binary_protocol)
+    if (self->flags.binary_protocol)
     {
       temp_return= binary_stats_fetch(stat_instance, args, instance, NULL);
     }
@@ -438,7 +458,9 @@ memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
       rc= MEMCACHED_SOME_ERRORS;
   }
 
-  *error= rc;
+  if (error)
+    *error= rc;
+
   return stats;
 }