X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=81895afab67b19102b9e4418ee1890663cf4128c;hb=349ca737f30ff0b6c3c71034f0930660663fa360;hp=d5411e86c0ba3becb6934e9981cbec2e36a859cf;hpb=96c84d98b1b2db8419072eea960e8800c189586b;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index d5411e86..81895afa 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -92,7 +92,8 @@ static inline bool _memcached_init(memcached_st *self)
   self->get_key_failure= NULL;
   self->delete_trigger= NULL;
   self->callbacks= NULL;
-  self->sasl= NULL;
+  self->sasl.callbacks= NULL;
+  self->sasl.is_allocated= false;
 
   return true;
 }
@@ -176,7 +177,7 @@ void memcached_free(memcached_st *ptr)
   if (ptr->continuum)
     libmemcached_free(ptr, ptr->continuum);
 
-  if (ptr->sasl)
+  if (ptr->sasl.callbacks)
   {
 #ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
     memcached_destroy_sasl_auth_data(ptr);
@@ -273,7 +274,7 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   }
 
 #ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  if (source->sasl && source->sasl->callbacks)
+  if (source->sasl.callbacks)
   {
     if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
     {