X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached.c;h=329e170dacc174679ad92e5b8dad0157d7a5ec92;hb=7c986323bd4eece0d805f4df17eb03ea094f84f6;hp=90d3a708aee4a414add1c1eaada8c430e2115f4e;hpb=965bde2b42f5ef2dd7b55b6b4b74822e7cfaa1de;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 90d3a708..329e170d 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -5,8 +5,6 @@
 
 memcached_st *memcached_create(memcached_st *ptr)
 {
-  memcached_result_st *result_ptr;
-
   if (ptr == NULL)
   {
     ptr= (memcached_st *)calloc(1, sizeof(memcached_st));
@@ -27,8 +25,11 @@ memcached_st *memcached_create(memcached_st *ptr)
 
   memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL);
 
-  result_ptr= memcached_result_create(ptr, &ptr->result);
-  WATCHPOINT_ASSERT(result_ptr);
+  if (! memcached_result_create(ptr, &ptr->result))
+  {
+    memcached_free(ptr);
+    return NULL;
+  }
   ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   ptr->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   ptr->retry_timeout= 0;
@@ -39,7 +40,6 @@ memcached_st *memcached_create(memcached_st *ptr)
   ptr->io_bytes_watermark= 65 * 1024;
 
   WATCHPOINT_ASSERT_INITIALIZED(&ptr->result);
-  WATCHPOINT_ASSERT_INITIALIZED(&ptr->hashkit);
 
   return ptr;
 }