fix bug, trying to walk off the end of the argv array

[m6w6/libmemcached] / lib / memcached_verbosity.c

diff --git a/lib/memcached_verbosity.c b/lib/memcached_verbosity.c
index 4e586cfb7b7b219410b9ee7d35929f5ba300213a..55a51842a8211a12449a3c5132a1ad345642b49f 100644 (file)
--- a/lib/memcached_verbosity.c
+++ b/lib/memcached_verbosity.c
@@ -3,7 +3,7 @@
 memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
 {
   unsigned int x;
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
@@ -14,15 +14,25 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                         "verbosity %u\r\n", verbosity);
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+    return MEMCACHED_WRITE_FAILURE;
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     memcached_return rc;
 
-    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
+    sent_length= write(ptr->hosts[x].fd, buffer, send_length);
+
+    if (sent_length == -1)
     {
-      fprintf(stderr, "failed verbosity\n");
+      fprintf(stderr, "error %s: write: %m\n", __FUNCTION__);
+      return MEMCACHED_WRITE_FAILURE;
+    }
 
+    if (sent_length != send_length)
+    {
+      fprintf(stderr, "error %s: short write %d %d: %m\n",
+             __FUNCTION__, sent_length, send_length);
       return MEMCACHED_WRITE_FAILURE;
     }