aboutsummaryrefslogtreecommitdiff
path: root/src/lib/tls
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-13 16:46:16 -0400
committerNick Mathewson <nickm@torproject.org>2020-03-13 16:46:16 -0400
commit6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f (patch)
treed569beb2f8f067c255966c0fb25dc4a69c8de42b /src/lib/tls
parentb504942331dabe1beb1ddb24a3aea75a565573e2 (diff)
parentb2e543bfe74bb5855a86429c61c0efc91d660719 (diff)
downloadtor-6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f.tar.gz
tor-6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to 'src/lib/tls')
-rw-r--r--src/lib/tls/buffers_tls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c
index bf03b61459..ed0f821ce8 100644
--- a/src/lib/tls/buffers_tls.c
+++ b/src/lib/tls/buffers_tls.c
@@ -146,10 +146,10 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen,
size_t flushed = 0;
ssize_t sz;
tor_assert(buf_flushlen);
- if (BUG(*buf_flushlen > buf->datalen)) {
+ IF_BUG_ONCE(*buf_flushlen > buf->datalen) {
*buf_flushlen = buf->datalen;
}
- if (BUG(flushlen > *buf_flushlen)) {
+ IF_BUG_ONCE(flushlen > *buf_flushlen) {
flushlen = *buf_flushlen;
}
sz = (ssize_t) flushlen;