X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver_list.cc;h=f03dc356b05d993aaa339dd8a6b145843320193d;hb=bce9a74e8addd1085b2e751508bf9ab0c2e84e45;hp=a4a617c0be71cde21a90bbe62cef4ca3854025bf;hpb=0ae14bed70947882f5ee9423dfcb20eeda7acdd9;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server_list.cc b/libmemcached/server_list.cc
index a4a617c0..f03dc356 100644
--- a/libmemcached/server_list.cc
+++ b/libmemcached/server_list.cc
@@ -83,7 +83,7 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
 
   memcached_string_t _hostname= { memcached_string_make_from_cstr(hostname) };
   /* @todo Check return type */
-  if (not __server_create_with(NULL, &new_host_list[count-1], _hostname, port, weight, port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET))
+  if (__server_create_with(NULL, &new_host_list[count-1], _hostname, port, weight, port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET) == NULL)
   {
     *error= memcached_set_errno(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
     return NULL;
@@ -118,7 +118,12 @@ uint32_t memcached_server_list_count(const memcached_server_list_st self)
 
 memcached_server_st *memcached_server_list(const memcached_st *self)
 {
-  return self->servers;
+  if (self)
+  {
+    return self->servers;
+  }
+
+  return NULL;
 }
 
 void memcached_server_list_set(memcached_st *self, memcached_server_st *list)