diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-16 17:24:11 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-16 17:24:11 -0500 |
| commit | c63c937465f91b60f07e70942e2cb5af1b90dce4 (patch) | |
| tree | 1b44da39cbe47b5176829100ed8ff038348681fc /src/or/connection_or.c | |
| parent | 591f65dde68c7847e4282c4cba5a11868fe13158 (diff) | |
| parent | b5e293afe6b3c98b50c23cc443969b5f840dca32 (diff) | |
| download | tor-c63c937465f91b60f07e70942e2cb5af1b90dce4.tar tor-c63c937465f91b60f07e70942e2cb5af1b90dce4.tar.gz | |
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 415a48dca..45266a99b 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1259,7 +1259,8 @@ connection_or_write_var_cell_to_buf(const var_cell_t *cell, tor_assert(conn); var_cell_pack_header(cell, hdr); connection_write_to_buf(hdr, sizeof(hdr), TO_CONN(conn)); - connection_write_to_buf(cell->payload, cell->payload_len, TO_CONN(conn)); + connection_write_to_buf((char*)cell->payload, + cell->payload_len, TO_CONN(conn)); if (cell->command != CELL_PADDING) conn->timestamp_last_added_nonpadding = approx_time(); } @@ -1388,7 +1389,7 @@ connection_or_send_netinfo(or_connection_t *conn) time_t now = time(NULL); routerinfo_t *me; int len; - char *out; + uint8_t *out; memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_NETINFO; |