X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ferror.cc;h=b0bdd3f85386fdb1f10032b86fd134efa5ea5593;hb=60c68bea5d034012f935eb849d92781c345c7214;hp=5afb22824a3c0932bce7ab5e499010345973f34e;hpb=a4f7c3b9413014291d0ca549f32455b3be10a6c0;p=m6w6%2Flibmemcached

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index 5afb2282..b0bdd3f8 100644
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -495,10 +495,15 @@ memcached_error_t *memcached_error_copy(const memcached_server_st& server)
 
 memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr)
 {
+  if (ptr == NULL)
+  {
+    return MEMCACHED_INVALID_ARGUMENTS;
+  }
+
   if (ptr and ptr->error_messages)
   {
     return ptr->error_messages->rc;
   }
 
-  return MEMCACHED_FAILURE;
+  return MEMCACHED_SUCCESS;
 }