X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_parse.c;h=366e77b55e6667b506baf4ff6bab6f72e9155e44;hb=ea2b5072372d2ff568932b99453123df0e85a840;hp=2a58d5353f9652230c1a6717908f150ba550cf2e;hpb=735295f0989edbd884a2c3935d1219a59ebe5698;p=awesomized%2Flibmemcached diff --git a/lib/memcached_parse.c b/lib/memcached_parse.c index 2a58d535..366e77b5 100644 --- a/lib/memcached_parse.c +++ b/lib/memcached_parse.c @@ -6,6 +6,7 @@ */ #include +#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; }