X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=329e170dacc174679ad92e5b8dad0157d7a5ec92;hb=58f976626a7636c7b2e87fca0674f709d34f33c0;hp=2fa4f42ce940cd4a19dd369851d0bc78d80eff86;hpb=8fd8f655540e3d6aa0b0a3eb0f4f7df1be2e6542;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 2fa4f42c..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;