From 8f9790a0235d5176c01f45b2c07eec5b46d7a2c9 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 12 Jul 2005 05:48:15 +0000 Subject: [PATCH] fix a seg fault with autodetecting which controller version is being used svn:r4531 --- src/or/buffers.c | 2 +- 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 8e097c9dde..4bc1173b01 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 *type_out, store its body's length into * *len_out, allocate and store a string for its body into * *body_out, and return 1. (body_out will always be NUL-terminated, diff --git a/src/or/control.c b/src/or/control.c index c2e3e90bf2..b8fc7d8f6d 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);