[tor-commits] [tor/master] CONN_LOG_PROTECT()'s first argument may not be 0

[nickm at torproject.org]

commit 8ebb3ce6e27c104e35d65662c04d23795f2b5605
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Apr 26 03:24:04 2011 +0200

    CONN_LOG_PROTECT()'s first argument may not be 0
    
    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.
---
 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 7d354c8..f693ad9 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3203,7 +3203,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;                                            \