X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=659d34078ce2f168523186b447c4ba6db4775cba;hb=d511c5699f3c1a7efe84b639b91592c2d1dc989e;hp=cb88c13b9d8d54e7eed9c5e21628ca5770f4a17c;hpb=28d3641c8331dfe348a119c6eb4bd776c526da48;p=m6w6%2Flibmemcached

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index cb88c13b..659d3407 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -186,9 +186,10 @@ static memcached_return_t set_hostinfo(memcached_instance_st* server)
   assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET);
   server->clear_addrinfo();
 
-  char str_port[MEMCACHED_NI_MAXSERV];
+  char str_port[MEMCACHED_NI_MAXSERV]= { 0 };
+  errno= 0;
   int length= snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port()));
-  if (length >= MEMCACHED_NI_MAXSERV or length <= 0)
+  if (length >= MEMCACHED_NI_MAXSERV or length <= 0 or errno != 0)
   {
     return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
                                memcached_literal_param("snprintf(NI_MAXSERV)"));
@@ -759,6 +760,7 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons
   case MEMCACHED_CONNECTION_TCP:
     rc= network_connect(server);
 
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
     if (LIBMEMCACHED_WITH_SASL_SUPPORT)
     {
       if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks)
@@ -771,6 +773,7 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons
         }
       }
     }
+#endif
     break;
 
   case MEMCACHED_CONNECTION_UNIX_SOCKET: