X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_key.c;h=9aac1ebcfd24f0828b66e8d75ce1e5cd8f35716a;hb=8dd458ed6369c78de103a19511f3319ee583607c;hp=7513592b9efc9fe8f49aca92bc69ecc1b21a2baa;hpb=ed1af1f5b70f7da90f5e8d255df134a8ccf3f526;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_key.c b/libmemcached/memcached_key.c index 7513592b..9aac1ebc 100644 --- a/libmemcached/memcached_key.c +++ b/libmemcached/memcached_key.c @@ -1,17 +1,20 @@ #include "common.h" -memcached_return memcachd_key_test(char **keys, size_t *key_length, - unsigned int number_of_keys) +memcached_return memcached_key_test(const char * const *keys, + const size_t *key_length, + size_t number_of_keys) { - int x; + uint32_t x; + memcached_return rc; for (x= 0; x < number_of_keys; x++) { - int y; - - if (*(key_length + x) == 0) - return MEMCACHED_BAD_KEY_PROVIDED; + size_t y; + rc= memcached_validate_key_length(*(key_length + x), false); + if (rc != MEMCACHED_SUCCESS) + return rc; + for (y= 0; y < *(key_length + x); y++) { if ((isgraph(keys[x][y])) == 0)