diff options
| -rw-r--r-- | src/common/aes.c | 2 | ||||
| -rw-r--r-- | src/common/log.c | 8 | ||||
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/connection.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 3a17af7f3..52b28b24a 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -265,7 +265,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) void aes_free_cipher(aes_cnt_cipher_t *cipher) { - assert(cipher); + tor_assert(cipher); #ifdef USE_OPENSSL_EVP EVP_CIPHER_CTX_cleanup(&cipher->key); #endif diff --git a/src/common/log.c b/src/common/log.c index 80f413c0a..1f541d976 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -57,7 +57,9 @@ sev_to_string(int severity) case LOG_NOTICE: return "notice"; case LOG_WARN: return "warn"; case LOG_ERR: return "err"; - default: assert(0); return "UNKNOWN"; + default: /* Call assert, not tor_assert, since tor_assert + * calls log on failure. */ + assert(0); return "UNKNOWN"; } } @@ -76,6 +78,7 @@ should_log_function_name(log_domain_mask_t domain, int severity) /* We care about places where bugs occur. */ return (domain == LD_BUG); default: + /* Call assert, not tor_assert, since tor_assert calls log on failure. */ assert(0); return 0; } } @@ -203,7 +206,7 @@ format_msg(char *buf, size_t buf_len, int r; char *end_of_prefix; - tor_assert(buf_len >= 2); /* prevent integer underflow */ + assert(buf_len >= 2); /* prevent integer underflow */ buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */ n = _log_prefix(buf, buf_len, severity); @@ -256,6 +259,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, logfile_t *lf; char *end_of_prefix=NULL; + /* Call assert, not tor_assert, since tor_assert calls log on failure. */ assert(format); LOCK_LOGS(); lf = logfiles; diff --git a/src/or/config.c b/src/or/config.c index cdddd3c4f..daa3dd920 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3718,7 +3718,7 @@ options_init_from_string(const char *cf, config_line_t *cl; int retval; int err = -1; - assert(msg); + tor_assert(msg); oldoptions = global_options; /* get_options unfortunately asserts if this is the first time we run*/ diff --git a/src/or/connection.c b/src/or/connection.c index 9e559530d..84cd26f2c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -734,7 +734,7 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address) (void)readable_address; log_fn(LOG_ERR, LD_BUG, "Unix domain sockets not supported, yet we tried to create one."); - assert(0); + tor_assert(0); }; #endif /* HAVE_SYS_UN_H */ |