Update for release 0.14

[awesomized/libmemcached] / lib / memcached_parse.c

diff --git a/lib/memcached_parse.c b/lib/memcached_parse.c
index 2a58d5353f9652230c1a6717908f150ba550cf2e..521542153725af9da5ca6df18fca3dffab57fbf6 100644 (file)
--- a/lib/memcached_parse.c
+++ b/lib/memcached_parse.c
@@ -6,6 +6,7 @@
 */
 
 #include <memcached.h>
+#include <common.h>
 
 memcached_server_st *memcached_servers_parse(char *server_strings)
 {
@@ -16,7 +17,7 @@ memcached_server_st *memcached_servers_parse(char *server_strings)
   memcached_server_st *servers= NULL;
   memcached_return rc;
 
-  assert(server_strings);
+  WATCHPOINT_ASSERT(server_strings);
 
   end_ptr= server_strings + strlen(server_strings);
 
@@ -28,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;
     }