Merge in version util.

[m6w6/libmemcached] / libmemcached / sasl.c

diff --git a/libmemcached/sasl.c b/libmemcached/sasl.c
index 440b76380e2ce69f4e96c614bf7d88dda5c63440..85edeb3d18e3cbbe8e4fbc76f10c55eb86bfae1e 100644 (file)
--- a/libmemcached/sasl.c
+++ b/libmemcached/sasl.c
@@ -20,7 +20,10 @@ void memcached_set_sasl_callbacks(memcached_st *ptr,
 
 const sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr)
 {
-  return ptr->sasl->callbacks;
+  if (ptr->sasl)
+    return ptr->sasl->callbacks;
+
+  return NULL;
 }
 
 /**