aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-07-12 05:48:15 +0000
committerRoger Dingledine <arma@torproject.org>2005-07-12 05:48:15 +0000
commit8f9790a0235d5176c01f45b2c07eec5b46d7a2c9 (patch)
tree22a239c243a98846edb9875bb3a381679bec86aa /src/or/control.c
parent63f9a8baa2046ef437717c2b440756e1ed946ba0 (diff)
downloadtor-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/control.c')
-rw-r--r--src/or/control.c4
1 files changed, 2 insertions, 2 deletions
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);