X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ftouch.cc;h=c78352479c8e0ba9644c864f997d49d6d4534a94;hb=b5495838fb245aa1068a1198ed549b98a9c3e666;hp=1107139d4f2a2cd7c7a8f95a960bd4c6ce34f31c;hpb=bd53173d0a23c8c2a0dac68056cbd2cc52d5a6ef;p=m6w6%2Flibmemcached

diff --git a/libmemcached/touch.cc b/libmemcached/touch.cc
index 1107139d..c7835247 100644
--- a/libmemcached/touch.cc
+++ b/libmemcached/touch.cc
@@ -42,20 +42,26 @@ static memcached_return_t ascii_touch(memcached_server_write_instance_st instanc
                                       const char *key, size_t key_length,
                                       time_t expiration)
 {
-  char buffer[21];
+  char expiration_buffer[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1];
+  int expiration_buffer_length= snprintf(expiration_buffer, sizeof(expiration_buffer), " %llu", (unsigned long long)expiration);
+  if (size_t(expiration_buffer_length) >= sizeof(expiration_buffer) or expiration_buffer_length < 0)
+  {
+    return memcached_set_error(*instance, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
+                               memcached_literal_param("snprintf(MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH)"));
+  }
 
-  int buffer_length= snprintf(buffer, sizeof(buffer), " %u", uint32_t(expiration));
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
+    { NULL, 0 },
     { memcached_literal_param("touch ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
     { key, key_length },
-    { buffer, buffer_length },
+    { expiration_buffer, expiration_buffer_length },
     { memcached_literal_param("\r\n") }
   };
 
   memcached_return_t rc;
-  if (memcached_failed(rc= memcached_vdo(instance, vector, 5, true)))
+  if (memcached_failed(rc= memcached_vdo(instance, vector, 6, true)))
   {
     memcached_io_reset(instance);
     return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
@@ -69,7 +75,9 @@ static memcached_return_t binary_touch(memcached_server_write_instance_st instan
                                        time_t expiration)
 {
   protocol_binary_request_touch request= {}; //{.bytes= {0}};
-  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+
+  initialize_binary_request(instance, request.message.header);
+
   request.message.header.request.opcode= PROTOCOL_BINARY_CMD_TOUCH;
   request.message.header.request.extlen= 4;
   request.message.header.request.keylen= htons((uint16_t)(key_length +memcached_array_size(instance->root->_namespace)));
@@ -77,15 +85,16 @@ static memcached_return_t binary_touch(memcached_server_write_instance_st instan
   request.message.header.request.bodylen= htonl((uint32_t)(key_length +memcached_array_size(instance->root->_namespace) +request.message.header.request.extlen));
   request.message.body.expiration= htonl((uint32_t) expiration);
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
+    { NULL, 0 },
     { request.bytes, sizeof(request.bytes) },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
     { key, key_length }
   };
 
   memcached_return_t rc;
-  if (memcached_failed(rc= memcached_vdo(instance, vector, 3, true)))
+  if (memcached_failed(rc= memcached_vdo(instance, vector, 4, true)))
   {
     memcached_io_reset(instance);
     return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
@@ -109,14 +118,14 @@ memcached_return_t memcached_touch_by_key(memcached_st *ptr,
   LIBMEMCACHED_MEMCACHED_TOUCH_START();
 
   memcached_return_t rc;
-  if (memcached_failed(rc= initialize_query(ptr)))
+  if (memcached_failed(rc= initialize_query(ptr, true)))
   {
     return rc;
   }
 
   if (memcached_failed(rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)))
   {
-    return memcached_set_error(*ptr, rc, MEMCACHED_AT);
+    return rc;
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
@@ -137,7 +146,7 @@ memcached_return_t memcached_touch_by_key(memcached_st *ptr,
   }
 
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-  rc= memcached_read_one_response(instance, buffer, sizeof(buffer), NULL);
+  rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
 
   if (rc == MEMCACHED_SUCCESS or rc == MEMCACHED_NOTFOUND)
   {