nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use evbuffer_copyout() in inspect_evbuffer().

Browse Source
This commit is contained in:
Nick Mathewson 2011-08-17 13:07:43 -04:00
parent 8932919366
commit d2cd67c83f
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/require-le-2.0.13
View File

@ -5,3 +5,8 @@
Tor work badly with bufferevents. Requiring 2.0.13-stable also Tor work badly with bufferevents. Requiring 2.0.13-stable also
means that Tor with bufferevents can take advantage of Libevent means that Tor with bufferevents can take advantage of Libevent
APIs introduced after 2.0.8-rc. APIs introduced after 2.0.8-rc.
o Minor bugfixes:
- Use evbuffer_copyout() in inspect_evbuffer(). This fixes a memory
leak, and lets Libevent worry about how to best copy data out
of a buffer.

26
src/or/buffers.c
View File

@ -1054,13 +1054,13 @@ fetch_var_cell_from_buf(buf_t *buf, var_cell_t **out, int linkproto)
#ifdef USE_BUFFEREVENTS #ifdef USE_BUFFEREVENTS
/** Try to read <b>n</b> bytes from <b>buf</b> at <b>pos</b> (which may be /** Try to read <b>n</b> bytes from <b>buf</b> at <b>pos</b> (which may be
* NULL for the start of the buffer), copying the data only if necessary. Set * NULL for the start of the buffer), copying the data only if necessary. Set
* *<b>data</b> to a pointer to the desired bytes. Set <b>free_out</b> to 1 * *<b>data_out</b> to a pointer to the desired bytes. Set <b>free_out</b> to 1
* if we needed to malloc *<b>data</b> because the original bytes were * if we needed to malloc *<b>data</b> because the original bytes were
* noncontiguous; 0 otherwise. Return the number of bytes actually available * noncontiguous; 0 otherwise. Return the number of bytes actually available
* at <b>data</b>. * at *<b>data_out</b>.
*/ */
static ssize_t static ssize_t
inspect_evbuffer(struct evbuffer *buf, char **data, size_t n, int *free_out, inspect_evbuffer(struct evbuffer *buf, char **data_out, size_t n, int *free_out,
struct evbuffer_ptr *pos) struct evbuffer_ptr *pos)
{ {
int n_vecs, i; int n_vecs, i;
@ -1075,25 +1075,15 @@ inspect_evbuffer(struct evbuffer *buf, char **data, size_t n, int *free_out,
struct evbuffer_iovec v; struct evbuffer_iovec v;
i = evbuffer_peek(buf, n, pos, &v, 1); i = evbuffer_peek(buf, n, pos, &v, 1);
tor_assert(i == 1); tor_assert(i == 1);
*data = v.iov_base; *data_out = v.iov_base;
*free_out = 0; *free_out = 0;
return v.iov_len; return v.iov_len;
} else { } else {
struct evbuffer_iovec *vecs = ev_ssize_t copied;
tor_malloc(sizeof(struct evbuffer_iovec)*n_vecs); *data_out = tor_malloc(n);
size_t copied = 0;
i = evbuffer_peek(buf, n, NULL, vecs, n_vecs);
tor_assert(i == n_vecs);
*data = tor_malloc(n);
for (i=0; i < n_vecs; ++i) {
size_t copy = n - copied;
if (copy > vecs[i].iov_len)
copy = vecs[i].iov_len;
tor_assert(copied+copy <= n);
memcpy(data+copied, vecs[i].iov_base, copy);
copied += copy;
}
*free_out = 1; *free_out = 1;
copied = evbuffer_copyout(buf, *data_out, n);
tor_assert(copied >= 0 && (size_t)copied == n);
return copied; return copied;
} }
} }