projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
memcached_behavior() causes commands to be buffered until they are flushed to
[m6w6/libmemcached]
/
lib
/
memcached_parse.c
diff --git
a/lib/memcached_parse.c
b/lib/memcached_parse.c
index d3b1827e5b659d62f02a8c7afa43959ea8ec3003..521542153725af9da5ca6df18fca3dffab57fbf6 100644
(file)
--- a/
lib/memcached_parse.c
+++ b/
lib/memcached_parse.c
@@
-17,7
+17,7
@@
memcached_server_st *memcached_servers_parse(char *server_strings)
memcached_server_st *servers= NULL;
memcached_return rc;
memcached_server_st *servers= NULL;
memcached_return rc;
-
assert
(server_strings);
+
WATCHPOINT_ASSERT
(server_strings);
end_ptr= server_strings + strlen(server_strings);
end_ptr= server_strings + strlen(server_strings);
@@
-29,16
+29,17
@@
memcached_server_st *memcached_servers_parse(char *server_strings)
char *ptr;
port= 0;
char *ptr;
port= 0;
- memset(buffer, 0, HUGE_STRING_LEN);
if (string)
{
memcpy(buffer, begin_ptr, string - begin_ptr);
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);
begin_ptr= string+1;
}
else
{
size_t length= strlen(begin_ptr);
memcpy(buffer, begin_ptr, length);
+ buffer[length]= 0;
begin_ptr= end_ptr;
}
begin_ptr= end_ptr;
}