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

[awesomized/libmemcached] / lib / memcached_flush.c

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index f7527a7c31eb42ebfc3070ea0118ab3a70e2f745..07fc3ac0b63ce712e740ace8ffc819e887431e26 100644 (file)
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -3,7 +3,7 @@
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
 {
   unsigned int x;
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
@@ -16,14 +16,26 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   {
     if (expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                            "flush_all %u\r\n", expiration);
+                            "flush_all %llu\r\n", (unsigned long long)expiration);
     else
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
-    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
+
+    if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+      return MEMCACHED_WRITE_FAILURE;
+
+    sent_length= write(ptr->hosts[x].fd, buffer, send_length);
+
+    if (sent_length == -1)
     {
-      fprintf(stderr, "failed flush_all TCP\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;
     }