projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in patch for additional lib for SASL
[m6w6/libmemcached]
/
clients
/
ms_conn.c
diff --git
a/clients/ms_conn.c
b/clients/ms_conn.c
index 82016e1fef60c3c557dfd45e4cb0827ebac10cc4..ae3145f5ae170c412b998e22d6f6b7d23ee7781e 100644
(file)
--- a/
clients/ms_conn.c
+++ b/
clients/ms_conn.c
@@
-18,6
+18,7
@@
#include <event.h>
#include <fcntl.h>
#include <netinet/tcp.h>
#include <event.h>
#include <fcntl.h>
#include <netinet/tcp.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#include <arpa/inet.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
@@
-2886,13
+2887,14
@@
static int ms_build_ascii_write_buf_set(ms_conn_t *c, ms_task_item_t *item)
int write_len;
char *buffer= c->wbuf;
int write_len;
char *buffer= c->wbuf;
- write_len= sprintf(buffer,
- " %u %d %d\r\n",
- 0,
- item->exp_time,
- item->value_size);
+ write_len= snprintf(buffer,
+ c->wsize,
+ " %u %d %d\r\n",
+ 0,
+ item->exp_time,
+ item->value_size);
- if (write_len > c->wsize)
+ if (write_len > c->wsize
|| write_len < 0
)
{
/* ought to be always enough. just fail for simplicity */
fprintf(stderr, "output command line too long.\n");
{
/* ought to be always enough. just fail for simplicity */
fprintf(stderr, "output command line too long.\n");