Merge in fixes for test which leaked memory.

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index d297c01fcfceb2d92f7e01ddfc7a9a03146e6a78..98f21a31af983a4e902288c5502513cdd5631fcb 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -137,6 +137,7 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached/options.h
 %{_includedir}/libmemcached/parse.h
 %{_includedir}/libmemcached/platform.h
+%{_includedir}/libmemcached/prefix_key.h
 %{_includedir}/libmemcached/protocol/cache.h
 %{_includedir}/libmemcached/protocol/callback.h
 %{_includedir}/libmemcached/protocol_handler.h

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index 93722602a544aaf599f1e8a21649fed7040dc35e..4b5884312da89460cc61d65620b97b2932ea7178 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -5615,6 +5615,7 @@ static test_return_t wrong_failure_counter_two_test(memcached_st *memc)
   test_true_got(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc));
   test_true(string);
   free(string);
+  memcached_free(memc_clone);
 
   return TEST_SUCCESS;
 }

diff --git a/tests/parser.cc b/tests/parser.cc
index d559b84d1776188f0a59bbc0eae21f1863fa541c..40904a085ce3fb435205782eb3288401071a04df 100644 (file)
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -521,11 +521,10 @@ test_return_t random_statement_build_test(memcached_st *junk)
       random_options+= option_list[random() % option_list.size()]->c_str;
       random_options+= " ";
     }
-    random_options.resize(random_options.size() -1);
 
     memcached_return_t rc;
     memcached_st *memc_ptr= memcached_create(NULL);
-    rc= memcached_parse_configuration(memc_ptr, random_options.c_str(), random_options.size());
+    rc= memcached_parse_configuration(memc_ptr, random_options.c_str(), random_options.size() -1);
     if (rc == MEMCACHED_PARSE_ERROR)
     {
       std::cerr << std::endl << "Failed to parse(" << memcached_strerror(NULL, rc) << "): " << random_options << std::endl;