nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.1

Browse Source
This commit is contained in:
Nick Mathewson 2020-03-13 16:46:16 -04:00
commit b2e543bfe7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug33093_logging Normal file
View File

@ -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.

4
src/lib/tls/buffers_tls.c
View File

@ -146,10 +146,10 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen,
size_t flushed = 0; size_t flushed = 0;
ssize_t sz; ssize_t sz;
tor_assert(buf_flushlen); tor_assert(buf_flushlen);
if (BUG(*buf_flushlen > buf->datalen)) { IF_BUG_ONCE(*buf_flushlen > buf->datalen) {
*buf_flushlen = buf->datalen; *buf_flushlen = buf->datalen;
} }
if (BUG(flushlen > *buf_flushlen)) { IF_BUG_ONCE(flushlen > *buf_flushlen) {
flushlen = *buf_flushlen; flushlen = *buf_flushlen;
} }
sz = (ssize_t) flushlen; sz = (ssize_t) flushlen;