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

reintroduce a memmove when there is enough misalignment to hold the new data; otherwise the size of the buffer may grow without bounds

Browse Source 
svn:r857
This commit is contained in:
Niels Provos 2008-06-21 06:10:10 +00:00
parent 99a1063e73
commit e711ce454a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buffer.c
View File

@ -659,12 +659,24 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
remain = chain->buffer_len - chain->misalign - chain->off; remain = chain->buffer_len - chain->misalign - chain->off;
if (remain >= datlen) { if (remain >= datlen) {
/*there's enough space to hold all the data in the current last chain*/ /* there's enough space to hold all the data in the
* current last chain */
memcpy(chain->buffer + chain->misalign + chain->off, memcpy(chain->buffer + chain->misalign + chain->off,
data, datlen); data, datlen);
chain->off += datlen; chain->off += datlen;
buf->total_len += datlen; buf->total_len += datlen;
goto out; goto out;
} else if (chain->misalign >= datlen) {
/* we can fit the data into the misalignment */
memmove(chain->buffer,
chain->buffer + chain->misalign,
chain->off);
chain->misalign = 0;
memcpy(chain->buffer + chain->off, data, datlen);
chain->off += datlen;
buf->total_len += datlen;
goto out;
} }
/* we need to add another chain */ /* we need to add another chain */
@ -678,7 +690,7 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
buf->last = chain->next; buf->last = chain->next;
buf->previous_to_last = chain; buf->previous_to_last = chain;
buf->total_len += datlen; buf->total_len += datlen;
memcpy(chain->buffer + chain->misalign + chain->off, memcpy(chain->buffer + chain->misalign + chain->off,
data, remain); data, remain);
chain->off += remain; chain->off += remain;