aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-04-04 03:34:42 +0200
committerNick Mathewson <nickm@torproject.org>2010-09-27 14:22:18 -0400
commit865bea3b895831a486b024e90f58d72d025ce284 (patch)
tree2e41a80cff9959d8b25f896b0d82398ab4b1ea16 /src/or/connection.c
parentbeb52352f2aeefb69ae2ee67e4e456346e28e40e (diff)
downloadtor-865bea3b895831a486b024e90f58d72d025ce284.tar.gz
tor-865bea3b895831a486b024e90f58d72d025ce284.zip
Some bufferevents related fixes and pointers for nickm
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index b6f0d5d69d..c9a730859a 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2908,7 +2908,8 @@ int
connection_fetch_from_buf(char *string, size_t len, connection_t *conn)
{
IF_HAS_BUFFEREVENT(conn, {
- return bufferevent_read(conn->bufev, string, len);
+ /* XXX overflow -seb */
+ return (int)bufferevent_read(conn->bufev, string, len);
}) ELSE_IF_NO_BUFFEREVENT {
return fetch_from_buf(string, len, conn->inbuf);
}