GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-09 00:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent unsupported modifications to bufferevent_sock buffers.

Browse Source 
In particular, we don't allow adding any data to end front of inbuf
(we do that when we read), or removing it from the front of outbuf (we
drain data only when we write).

svn:r1144
This commit is contained in:
Nick Mathewson 2009-04-08 03:05:42 +00:00
parent 747331d164
commit 72b6ffe869
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -144,7 +144,7 @@ Changes in current version:
o New evutil_make_listen_socket_reuseable() to abstract SO_REUSEADDR.
o New bind-to option to allow DNS clients to bind to an arbitrary port for outgoing requests.
o evbuffers can now be "frozen" to prevent operations at one or both ends.
o Bufferevents now notice external attempts to add data to an inbuf or remove it from an outbuf, and stop them.
Changes in 1.4.0:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

7
bufferevent_sock.c
View File

@ -134,7 +134,9 @@ bufferevent_readcb(evutil_socket_t fd, short event, void *arg)
}
}
evbuffer_unfreeze(input, 0);
res = evbuffer_read(input, fd, howmuch);
evbuffer_freeze(input, 0);
if (res == -1) {
int err = evutil_socket_geterror(fd);
@ -180,7 +182,9 @@ bufferevent_writecb(evutil_socket_t fd, short event, void *arg)
}
if (EVBUFFER_LENGTH(bufev->output)) {
evbuffer_unfreeze(bufev->output, 1);
res = evbuffer_write(bufev->output, fd);
evbuffer_freeze(bufev->output, 1);
if (res == -1) {
int err = evutil_socket_geterror(fd);
if (EVUTIL_ERR_RW_RETRIABLE(err))
@ -239,6 +243,9 @@ bufferevent_socket_new(struct event_base *base, evutil_socket_t fd,
evbuffer_add_cb(bufev->output, bufferevent_socket_outbuf_cb, bufev);
evbuffer_freeze(bufev->input, 0);
evbuffer_freeze(bufev->output, 1);
return bufev;
}