Fix lack of free() in bug (quiet valgrind)

[m6w6/libmemcached] / tests / function.c

diff --git a/tests/function.c b/tests/function.c
index 77a397817935edf5486407de6e4a9643a49ce92d..514fe3c2fb8673f3977fc49053a353801e48b605 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -1630,6 +1630,7 @@ uint8_t user_supplied_bug12(memcached_st *memc)
                         &value_length, &flags, &rc);           
   assert(value);
   assert(rc == MEMCACHED_SUCCESS);
+  free(value);
 
   rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"),
                           1, &number_value);
@@ -2037,6 +2038,7 @@ memcached_return pre_hash_ketama(memcached_st *memc)
 
   return MEMCACHED_SUCCESS;
 }
+
 void my_free(memcached_st *ptr, void *mem)
 {
   free(mem);
@@ -2060,8 +2062,9 @@ memcached_return set_memory_alloc(memcached_st *memc)
 
     rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &my_malloc);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_malloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc);
-    assert(test_ptr == (memcached_malloc_function)my_malloc);
+    test_ptr= (memcached_malloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(test_ptr == my_malloc);
   }
 
   {
@@ -2070,7 +2073,8 @@ memcached_return set_memory_alloc(memcached_st *memc)
 
     rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &my_realloc);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_realloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc);
+    test_ptr= (memcached_realloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc);
+    assert(rc == MEMCACHED_SUCCESS);
     assert(test_ptr == my_realloc);
   }
 
@@ -2080,7 +2084,8 @@ memcached_return set_memory_alloc(memcached_st *memc)
 
     rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, my_free);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_free_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc);
+    test_ptr= (memcached_free_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc);
+    assert(rc == MEMCACHED_SUCCESS);
     assert(test_ptr == my_free);
   }