[tor-commits] [tor/master] Use tor_assert, not assert.

[nickm@xxxxxxxxxxxxxx]

commit e8d7953c611200835d4011b12e210e878f0d13fd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 23 09:24:20 2016 -0400

    Use tor_assert, not assert.
---
 src/or/router.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index 40aae29..e9961d4 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1970,8 +1970,8 @@ static void
 router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
                                                  int listener_type)
 {
-  assert(listener_type == CONN_TYPE_OR_LISTENER ||
-         listener_type == CONN_TYPE_DIR_LISTENER);
+  tor_assert(listener_type == CONN_TYPE_OR_LISTENER ||
+             listener_type == CONN_TYPE_DIR_LISTENER);
 
   /* The first advertised Port may be the magic constant CFG_AUTO_PORT.
    */
@@ -1985,7 +1985,7 @@ router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
                                                                 AF_INET);
         /* If we're building a descriptor with no advertised address,
          * something is terribly wrong. */
-        assert(port_addr);
+        tor_assert(port_addr);
 
         tor_addr_t desc_addr;
         char port_addr_str[TOR_ADDR_BUF_LEN];

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits