Merging bzr://gaz.tangent.org/libmemcached/build2/ to Build branch

[m6w6/libmemcached] / libmemcached / key.cc

diff --git a/libmemcached/key.cc b/libmemcached/key.cc
index 02e0c2b326dbfcb51400c04e8c2c17c3a36dd58e..19d1f957acefc01214ac2ffdaa2198e613d05093 100644 (file)
--- a/libmemcached/key.cc
+++ b/libmemcached/key.cc
@@ -37,30 +37,47 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_key_test(const memcached_st &memc,
+memcached_return_t memcached_key_test(memcached_st &memc,
                                       const char * const *keys,
                                       const size_t *key_length,
                                       size_t number_of_keys)
 {
-  if (not memc.flags.verify_key)
-    return MEMCACHED_SUCCESS;
+  if (keys == NULL or key_length == NULL)
+  {
+    return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, memcached_literal_param("Key was NULL or length of key was zero."));
+  }
+
+  // If we don't need to verify the key, or we are using the binary protoocol,
+  // we just check the size of the key
+  if (memc.flags.verify_key == false or memc.flags.binary_protocol == true)
+  {
+    for (size_t x= 0; x < number_of_keys; x++)
+    {
+      // We should set binary key, but the memcached server is broken for
+      // longer keys at the moment.
+      memcached_return_t rc= memcached_validate_key_length(*(key_length +x), false /* memc.flags.binary_protocol */);
+      if (memcached_failed(rc))
+      {
+        return memcached_set_error(memc, rc, MEMCACHED_AT, memcached_literal_param("Key provided was too long."));
+      }
+    }
 
-  if (memc.flags.binary_protocol)
     return MEMCACHED_SUCCESS;
+  }
 
-  for (uint32_t x= 0; x < number_of_keys; x++)
+  for (size_t x= 0; x < number_of_keys; x++)
   {
     memcached_return_t rc= memcached_validate_key_length(*(key_length + x), false);
     if (memcached_failed(rc))
     {
-      return rc;
+      return memcached_set_error(memc, rc, MEMCACHED_AT, memcached_literal_param("Key provided was too long."));
     }
  
     for (size_t y= 0; y < *(key_length + x); y++)
     {
       if ((isgraph(keys[x][y])) == 0)
       {
-        return MEMCACHED_BAD_KEY_PROVIDED;
+        return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, memcached_literal_param("Key provided had invalid character."));
       }
     }
   }