diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-07-12 05:48:15 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-07-12 05:48:15 +0000 |
| commit | 8f9790a0235d5176c01f45b2c07eec5b46d7a2c9 (patch) | |
| tree | 22a239c243a98846edb9875bb3a381679bec86aa /src/or | |
| parent | 63f9a8baa2046ef437717c2b440756e1ed946ba0 (diff) | |
| download | tor-8f9790a0235d5176c01f45b2c07eec5b46d7a2c9.tar tor-8f9790a0235d5176c01f45b2c07eec5b46d7a2c9.tar.gz | |
fix a seg fault with autodetecting which controller version is being used
svn:r4531
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/buffers.c | 2 | ||||
| -rw-r--r-- | src/or/control.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 8e097c9dd..4bc1173b0 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1082,7 +1082,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req) #define CONTROL_CMD_FRAGMENTHEADER 0x0010 #define CONTROL_CMD_FRAGMENT 0x0011 -/** If there is a complete version 0control message waiting on buf, then store +/** If there is a complete version 0 control message waiting on buf, then store * its contents into *<b>type_out</b>, store its body's length into * *<b>len_out</b>, allocate and store a string for its body into * *<b>body_out</b>, and return 1. (body_out will always be NUL-terminated, diff --git a/src/or/control.c b/src/or/control.c index c2e3e90bf..b8fc7d8f6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1948,7 +1948,7 @@ connection_control_process_inbuf_v0(connection_t *conn) { uint32_t body_len; uint16_t command_type; - char *body; + char *body=NULL; again: /* Try to suck a control message from the buffer. */ @@ -1957,7 +1957,7 @@ connection_control_process_inbuf_v0(connection_t *conn) { case -2: tor_free(body); - log_fn(LOG_INFO, "Detected v1 contol protocol on connection (fd %d)", + log_fn(LOG_INFO, "Detected v1 control protocol on connection (fd %d)", conn->s); conn->state = CONTROL_CONN_STATE_NEEDAUTH_V1; return connection_control_process_inbuf_v1(conn); |