nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

CONN_LOG_PROTECT()'s first argument may not be 0

Browse Source 
Make that explicit by adding an assert and removing a null-check. All of
its callers currently depend on the argument being non-null anyway.
Silences a few clang complaints.
This commit is contained in:
Sebastian Hahn 2011-04-26 03:24:04 +02:00 committed by Nick Mathewson
parent 80e57af50f
commit 8ebb3ce6e2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/or.h
View File

@ -3203,7 +3203,9 @@ typedef enum buildtimeout_set_event_t {
*/ */
#define CONN_LOG_PROTECT(conn, stmt) \ #define CONN_LOG_PROTECT(conn, stmt) \
STMT_BEGIN \ 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) \ if (_log_conn_is_control) \
disable_control_logging(); \ disable_control_logging(); \
STMT_BEGIN stmt; STMT_END; \ STMT_BEGIN stmt; STMT_END; \