Commit b2e543bf authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

Merge branch 'maint-0.3.5' into maint-0.4.1

parents c96cf149 b9d71f38
o Minor bugfixes (logging):
- If we encounter a bug when flushing a buffer to a TLS connection,
only log the bug once per invocation of the Tor process. Previously we
would log with every occurrence, which could cause us to run out of
disk space. Fixes bug 33093; bugfix on
......@@ -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;
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;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment