Updating to remove memory leak in functions.c (aka test cases).

[awesomized/libmemcached] / lib / memcached.c

diff --git a/lib/memcached.c b/lib/memcached.c
index 861bafda95dbaf76dba54503cf90efc558268b6f..30099c39ff7a2f643f2edd9caaaddb0ee5b0d979 100644 (file)
--- a/lib/memcached.c
+++ b/lib/memcached.c
@@ -22,8 +22,8 @@ memcached_st *memcached_create(memcached_st *ptr)
   }
   string_ptr= memcached_string_create(ptr, &ptr->result_buffer, 0);
   WATCHPOINT_ASSERT(string_ptr);
-  ptr->poll_timeout= -1;
-  ptr->distribution= MEMCACHED_DISTRIBUTION_MODULO;
+  ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
   return ptr;
 }
@@ -48,7 +48,7 @@ void memcached_free(memcached_st *ptr)
 */
 memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
 {
-  memcached_return rc;
+  memcached_return rc= MEMCACHED_SUCCESS;
   memcached_st *new_clone;
 
   if (ptr == NULL)
@@ -61,9 +61,12 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   }
   
   new_clone= memcached_create(clone);
+  
+  if (new_clone == NULL)
+    return NULL;
 
-
-  rc= memcached_server_push(new_clone, ptr->hosts);
+  if (ptr->hosts)
+    rc= memcached_server_push(new_clone, ptr->hosts);
 
   if (rc != MEMCACHED_SUCCESS)
   {
@@ -74,11 +77,11 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
 
 
   new_clone->flags= ptr->flags;
-  new_clone->number_of_hosts= ptr->number_of_hosts;
   new_clone->send_size= ptr->send_size;
   new_clone->recv_size= ptr->recv_size;
   new_clone->poll_timeout= ptr->poll_timeout;
   new_clone->distribution= ptr->distribution;
+  new_clone->hash= ptr->hash;
 
   return new_clone;
 }