Incomming fixes from Charles on the replication branch.

[awesomized/libmemcached] / lib / memcached_parse.c

diff --git a/lib/memcached_parse.c b/lib/memcached_parse.c
index 069593e5ec191d21208b586e632d7e8848d82826..366e77b55e6667b506baf4ff6bab6f72e9155e44 100644 (file)
--- a/lib/memcached_parse.c
+++ b/lib/memcached_parse.c
@@ -6,7 +6,7 @@
 */
 
 #include <memcached.h>
-#include <common.h>
+#include "common.h"
 
 memcached_server_st *memcached_servers_parse(char *server_strings)
 {
@@ -29,16 +29,17 @@ memcached_server_st *memcached_servers_parse(char *server_strings)
     char *ptr;
     port= 0;
 
-    memset(buffer, 0, HUGE_STRING_LEN);
     if (string)
     {
       memcpy(buffer, begin_ptr, string - begin_ptr);
+      buffer[(unsigned int)(string - begin_ptr)]= 0;
       begin_ptr= string+1;
     }
     else
     {
       size_t length= strlen(begin_ptr);
       memcpy(buffer, begin_ptr, length);
+      buffer[length]= 0;
       begin_ptr= end_ptr;
     }