summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-13 16:46:09 -0400
committerNick Mathewson <nickm@torproject.org>2020-03-13 16:46:09 -0400
commitb9d71f3848a2858dc0a3c5232c85d97525aacd25 (patch)
treed8315fa740f196e53f782cd36c081737e1698343 /src
parentadd387c5071a1ee7889e3789e7b4143bb8856d0a (diff)
parent1f163fcbde4591bcb5764d6bbe0fea8aa559fc33 (diff)
downloadtor-b9d71f3848a2858dc0a3c5232c85d97525aacd25.tar.gz
tor-b9d71f3848a2858dc0a3c5232c85d97525aacd25.zip
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
Diffstat (limited to 'src')
-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 e92cb9163f..b570216df0 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;