diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
| commit | acd6a4856bccff92eb241b18066ca7df577ab5f2 (patch) | |
| tree | 153eb944a6f61e3591831b3fde0385ee4e51e5bd /src/or/or.h | |
| parent | e36f9d1d9beec0daed57b68f936293dccc77b171 (diff) | |
| parent | 0b3166fffa0e5e19c63fd95538f87d634444d28c (diff) | |
| download | tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.tar tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index f45ccb7bc..36ab508ca 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3388,7 +3388,9 @@ typedef enum buildtimeout_set_event_t { */ #define CONN_LOG_PROTECT(conn, stmt) \ STMT_BEGIN \ - int _log_conn_is_control = (conn && conn->type == CONN_TYPE_CONTROL); \ + int _log_conn_is_control; \ + tor_assert(conn); \ + _log_conn_is_control = (conn->type == CONN_TYPE_CONTROL); \ if (_log_conn_is_control) \ disable_control_logging(); \ STMT_BEGIN stmt; STMT_END; \ |