diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
| commit | c79427a9921787abab8f0d6e0c621dc974d98453 (patch) | |
| tree | 1c7c6a8e83c33c3206e675f9d161f1c1afc9ef17 /src/or/buffers.c | |
| parent | dd2ae32bc181efdc134c25359bc67d073c48a1d0 (diff) | |
| parent | a62038f01db0df22f864623e6d82d69b447c1414 (diff) | |
| download | tor-c79427a9921787abab8f0d6e0c621dc974d98453.tar.gz tor-c79427a9921787abab8f0d6e0c621dc974d98453.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 11c4fc8b9b..1018a24499 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1003,7 +1003,7 @@ fetch_var_cell_from_buf(buf_t *buf, var_cell_t **out, int linkproto) result->circ_id = ntohs(get_uint16(hdr)); buf_remove_from_front(buf, VAR_CELL_HEADER_SIZE); - peek_from_buf(result->payload, length, buf); + peek_from_buf((char*) result->payload, length, buf); buf_remove_from_front(buf, length); check(); |