Commit 6ed2c9e5 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.4.1' into maint-0.4.2

parents b5049423 b2e543bf

changes/bug33093_logging

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/lib/tls/buffers_tls.c

+2 −2
Original line number Diff line number Diff line
@@ -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;