X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_hosts.c;h=6f49b270a98b305426d168ea528b11c3d16e3a8c;hb=cfe8176feba42fc63e8f627f9ac613a12a368b92;hp=402018b4ae90cb58492776a5afed153c9c908b71;hpb=666a820df3605bf92a4ffefed6ec3b1649f37291;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_hosts.c b/lib/memcached_hosts.c
index 402018b4..6f49b270 100644
--- a/lib/memcached_hosts.c
+++ b/lib/memcached_hosts.c
@@ -38,7 +38,7 @@ static void host_reset(memcached_server_st *host, char *hostname, unsigned int p
                        memcached_connection type)
 {
   memset(host,  0, sizeof(memcached_server_st));
-  memcpy(host->hostname, hostname, strlen(hostname));
+  strncpy(host->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
   host->port= port;
   host->fd= -1;
   host->type= type;
@@ -148,8 +148,8 @@ memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
   unsigned int count;
   memcached_server_st *new_host_list;
 
-  if (!hostname)
-    return ptr;
+  if (hostname == NULL || error == NULL)
+    return NULL;
 
   if (!port)
     port= MEMCACHED_DEFAULT_PORT;