X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_get.c;h=2cc40151b4bcf4911549af13eb9e6b10e692c62a;hb=95084fee7261488e27be38d9c50957f82a75f416;hp=dcaa8988a257344a543c34cf39e0fe6963c714c5;hpb=2fe4e1635c70f4b2815aaf9bc147fee0b2c93de3;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index dcaa8988..2cc40151 100644
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -250,6 +250,7 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
                                            unsigned int number_of_keys)
 {
   memcached_return rc= MEMCACHED_NOTFOUND;
+  uint32_t x;
 
   int flush= number_of_keys == 1;
 
@@ -257,7 +258,7 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
     If a server fails we warn about errors and start all over with sending keys
     to the server.
   */
-  for (int x= 0; x < number_of_keys; x++) 
+  for (x= 0; x < number_of_keys; x++) 
   {
     unsigned int server_key;
 
@@ -273,13 +274,22 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
         continue;
     }
      
-    protocol_binary_request_getk request= {0};
+    protocol_binary_request_getk request= {.bytes= {0}};
     request.message.header.request.magic= PROTOCOL_BINARY_REQ;
     if (number_of_keys == 1)
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
     else
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
 
+    memcached_return vk;
+    vk= memcached_validate_key_length(key_length[x],
+                                      ptr->flags & MEM_BINARY_PROTOCOL);
+    unlikely (vk != MEMCACHED_SUCCESS) {
+      if (x > 0)
+        memcached_io_reset(&ptr->hosts[server_key]);
+      return vk;
+    }
+
     request.message.header.request.keylen= htons((uint16_t)key_length[x]);
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
     request.message.header.request.bodylen= htonl(key_length[x]);
@@ -301,12 +311,12 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
     /*
      * Send a noop command to flush the buffers
      */
-    protocol_binary_request_noop request= {0};
+    protocol_binary_request_noop request= {.bytes= {0}};
     request.message.header.request.magic= PROTOCOL_BINARY_REQ;
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP;
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
     
-    for (int x= 0; x < ptr->number_of_hosts; x++)
+    for (x= 0; x < ptr->number_of_hosts; x++)
       if (memcached_server_response_count(&ptr->hosts[x])) 
       {
         if (memcached_io_write(&ptr->hosts[x], NULL, 0, 1) == -1)