Fix issue where stale result set might end up being read (this has never been reporte...

[m6w6/libmemcached] / tests / libmemcached-1.0 / mem_functions.cc

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 2f1dff722e0cc0a5f157b56908d66aa511e42a81..8b88697a71c9af781cce0aec919e0def2dbacdd3 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -1026,12 +1026,11 @@ test_return_t bad_key_test(memcached_st *memc)
 }
 
 #define READ_THROUGH_VALUE "set for me"
-static memcached_return_t read_through_trigger(memcached_st *memc,
-                                               char *key,
-                                               size_t key_length,
+static memcached_return_t read_through_trigger(memcached_st *, // memc
+                                               char *, // key
+                                               size_t, //  key_length,
                                                memcached_result_st *result)
 {
-  (void)memc;(void)key;(void)key_length;
   return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE));
 }
 
@@ -1062,8 +1061,8 @@ test_return_t read_through(memcached_st *memc)
                         &string_length, &flags, &rc);
 
   test_compare(MEMCACHED_SUCCESS, rc);
-  test_compare(string_length, sizeof(READ_THROUGH_VALUE) -1);
-  test_true(string[sizeof(READ_THROUGH_VALUE) -1] == 0);
+  test_compare(sizeof(READ_THROUGH_VALUE) -1, string_length);
+  test_compare(0, string[sizeof(READ_THROUGH_VALUE) -1]);
   test_strcmp(READ_THROUGH_VALUE, string);
   free(string);
 
@@ -4606,7 +4605,7 @@ test_return_t regression_994772_TEST(memcached_st* memc)
                memcached_mget(memc, keys, key_length, 1));
 
   memcached_return_t rc;
-  memcached_result_st *results = memcached_fetch_result(memc, NULL, &rc);
+  memcached_result_st *results= memcached_fetch_result(memc, NULL, &rc);
   test_true(results);
   test_compare(MEMCACHED_SUCCESS, rc);
 
@@ -4614,6 +4613,8 @@ test_return_t regression_994772_TEST(memcached_st* memc)
   uint64_t cas_value= memcached_result_cas(results);
   test_true(cas_value);
 
+  memcached_result_free(results);
+
   // Bad cas value, sanity check 
   test_true(cas_value != 9999);
   test_compare(MEMCACHED_END,