cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Explode less badly in the case where we're told to prepend/append/remove a buffer to itself. Note some API/implementation deficiencies.

Browse Source 
svn:r1110
This commit is contained in:
Nick Mathewson 2009-02-10 19:39:22 +00:00
parent 20f809ce8c
commit 01456265c3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buffer.c
View File

@ -350,7 +350,7 @@ evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
size_t out_total_len = outbuf->total_len; size_t out_total_len = outbuf->total_len;
size_t in_total_len = inbuf->total_len; size_t in_total_len = inbuf->total_len;
if (in_total_len == 0) if (in_total_len == 0 || outbuf == inbuf)
return (0); return (0);
if (out_total_len == 0) { if (out_total_len == 0) {
@ -374,7 +374,7 @@ evbuffer_prepend_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
size_t out_total_len = outbuf->total_len; size_t out_total_len = outbuf->total_len;
size_t in_total_len = inbuf->total_len; size_t in_total_len = inbuf->total_len;
if (!in_total_len) if (!in_total_len || inbuf == outbuf)
return; return;
if (out_total_len == 0) { if (out_total_len == 0) {
@ -433,6 +433,7 @@ evbuffer_drain(struct evbuffer *buf, size_t len)
int int
evbuffer_remove(struct evbuffer *buf, void *data_out, size_t datlen) evbuffer_remove(struct evbuffer *buf, void *data_out, size_t datlen)
{ {
/*XXX fails badly on sendfile case. */
struct evbuffer_chain *chain = buf->first, *tmp; struct evbuffer_chain *chain = buf->first, *tmp;
char *data = data_out; char *data = data_out;
size_t nread; size_t nread;
@ -481,10 +482,16 @@ int
evbuffer_remove_buffer(struct evbuffer *src, struct evbuffer *dst, evbuffer_remove_buffer(struct evbuffer *src, struct evbuffer *dst,
size_t datlen) size_t datlen)
{ {
/*XXX We should have an option to force this to be zero-copy.*/
/*XXX can fail badly on sendfile case. */
struct evbuffer_chain *chain = src->first; struct evbuffer_chain *chain = src->first;
struct evbuffer_chain *previous = chain, *previous_to_previous = NULL; struct evbuffer_chain *previous = chain, *previous_to_previous = NULL;
size_t nread = 0; size_t nread = 0;
if (datlen == 0 || dst == src)
return (0);
/* short-cut if there is no more data buffered */ /* short-cut if there is no more data buffered */
if (datlen >= src->total_len) { if (datlen >= src->total_len) {
datlen = src->total_len; datlen = src->total_len;
@ -492,9 +499,6 @@ evbuffer_remove_buffer(struct evbuffer *src, struct evbuffer *dst,
return (datlen); return (datlen);
} }
if (datlen == 0)
return (0);
/* removes chains if possible */ /* removes chains if possible */
while (chain->off <= datlen) { while (chain->off <= datlen) {
nread += chain->off; nread += chain->off;