diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-09 16:44:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-09 16:44:12 -0400 |
| commit | 0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94 (patch) | |
| tree | 38e3f8b0c2ebea5289c777274fe8a49451acc196 | |
| parent | ab064cf762f0049913ae346dc9b500bc9580395a (diff) | |
| parent | ff304f3be7d6b5753d2066a0af9772b451f7f442 (diff) | |
| download | tor-0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94.tar.gz tor-0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94.zip | |
Merge remote-tracking branch 'tor-github/pr/1394'
| -rw-r--r-- | changes/bug31939 | 3 | ||||
| -rw-r--r-- | src/lib/tls/buffers_tls.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug31939 b/changes/bug31939 new file mode 100644 index 0000000000..a36ea495d6 --- /dev/null +++ b/changes/bug31939 @@ -0,0 +1,3 @@ + o Minor bugfixes (tls, logging): + - Log TLS read buffer length bugs once, rather than filling the logs + with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 3c18cc7e43..bf03b61459 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - if (BUG(buf->datalen >= INT_MAX)) + IF_BUG_ONCE(buf->datalen >= INT_MAX) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) return -1; while (at_most > total_read) { |