tor

commit 6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f
parent b504942331dabe1beb1ddb24a3aea75a565573e2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 13 Mar 2020 16:46:16 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

Diffstat:
A
changes/bug33093_logging
 | 
5
+++++
M
src/lib/tls/buffers_tls.c
 | 
4
++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug33093_logging 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
@@ -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;