diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:46:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:46:16 -0400 |
| commit | 386876971447b12388582e6297069bfbdaf3e2d3 (patch) | |
| tree | ee4fff9e4ee61ee73c69487e3467534de70ad8b3 | |
| parent | f141b861a891f7c1ee70e4e53f8b44a060161810 (diff) | |
| parent | b2e543bfe74bb5855a86429c61c0efc91d660719 (diff) | |
| download | tor-386876971447b12388582e6297069bfbdaf3e2d3.tar.gz tor-386876971447b12388582e6297069bfbdaf3e2d3.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -rw-r--r-- | changes/bug33093_logging | 5 | ||||
| -rw-r--r-- | src/lib/tls/buffers_tls.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug33093_logging b/changes/bug33093_logging new file mode 100644 index 0000000000..e26e4a64af --- /dev/null +++ b/changes/bug33093_logging @@ -0,0 +1,5 @@ + 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 0.3.2.2-alpha. 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; |