Fix for valgrind issue around memcached_result_st not being free()

[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 e39c2a8bc8eccc134e4a30462f04637092eb7da4..f8ac3da67ce8a15482bd91dfa13115ff913c9cb1 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -1699,7 +1699,7 @@ test_return_t mget_execute(memcached_st *original_memc)
 }
 
 #define REGRESSION_BINARY_VS_BLOCK_COUNT  20480
-static pairs_st *global_pairs;
+static pairs_st *global_pairs= NULL;
 
 test_return_t key_setup(memcached_st *memc)
 {
@@ -1713,6 +1713,7 @@ test_return_t key_setup(memcached_st *memc)
 test_return_t key_teardown(memcached_st *)
 {
   pairs_free(global_pairs);
+  global_pairs= NULL;
 
   return TEST_SUCCESS;
 }
@@ -1722,9 +1723,14 @@ test_return_t block_add_regression(memcached_st *memc)
   /* First add all of the items.. */
   for (ptrdiff_t x= 0; x < REGRESSION_BINARY_VS_BLOCK_COUNT; ++x)
   {
-    char blob[1024] = {0};
-
-    memcached_return_t rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0);
+    libtest::vchar_t blob;
+    libtest::vchar::make(blob, 1024);
+
+    memcached_return_t rc= memcached_add_by_key(memc,
+                                                test_literal_param("bob"),
+                                                global_pairs[x].key, global_pairs[x].key_length,
+                                                &blob[0], blob.size(),
+                                                time_t(0), uint32_t(0));
     test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE, memcached_strerror(NULL, rc));
   }
 
@@ -4343,6 +4349,34 @@ test_return_t wrong_failure_counter_two_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+test_return_t regression_996813_TEST(memcached_st *)
+{
+  memcached_st* memc= memcached_create(NULL);
+
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 1));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 300));
+  test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 30));
+
+  // We will never connect to these servers
+  in_port_t base_port= 11211;
+  for (size_t x= 0; x < 17; x++)
+  {
+    test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "10.2.3.4", base_port +x));
+  }
+  test_compare(16U, memcached_generate_hash(memc, test_literal_param("SZ6hu0SHweFmpwpc0w2R")));
+  test_compare(1U, memcached_generate_hash(memc, test_literal_param("SQCK9eiCf53YxHWnYA.o")));
+  test_compare(10U, memcached_generate_hash(memc, test_literal_param("SUSDkGXuuZC9t9VhMwa.")));
+  test_compare(8U, memcached_generate_hash(memc, test_literal_param("SnnqnJARfaCNT679iAF_")));
+
+  memcached_free(memc);
+
+  return TEST_SUCCESS;
+}
+
 
 /*
  * Test that ensures mget_execute does not end into recursive calls that finally fails
@@ -4556,6 +4590,48 @@ test_return_t regression_bug_490520(memcached_st *original_memc)
 }
 
 
+test_return_t regression_994772_TEST(memcached_st* memc)
+{
+  test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1));
+
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_set(memc,
+                             test_literal_param(__func__), // Key
+                             test_literal_param(__func__), // Value
+                             time_t(0), uint32_t(0)));
+
+  const char *keys[] = { __func__ };
+  size_t key_length[]= { strlen(__func__) };
+  test_compare(MEMCACHED_SUCCESS,
+               memcached_mget(memc, keys, key_length, 1));
+
+  memcached_return_t rc;
+  memcached_result_st *results= memcached_fetch_result(memc, NULL, &rc);
+  test_true(results);
+  test_compare(MEMCACHED_SUCCESS, rc);
+
+  test_strcmp(__func__, memcached_result_value(results));
+  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,
+               memcached_cas(memc,
+                             test_literal_param(__func__), // Key
+                             test_literal_param(__FILE__), // Value
+                             time_t(0), uint32_t(0), 9999));
+
+  test_compare(MEMCACHED_SUCCESS, memcached_set(memc,
+                                                "different", strlen("different"), // Key
+                                                test_literal_param(__FILE__), // Value
+                                                time_t(0), uint32_t(0)));
+
+  return TEST_SUCCESS;
+}
+
 test_return_t regression_bug_854604(memcached_st *)
 {
   char buffer[1024];