[tor-commits] [tor/maint-0.4.1] tls: Log TLS read buffer length bugs once

[teor at torproject.org]

commit ff304f3be7d6b5753d2066a0af9772b451f7f442
Author: teor <teor at torproject.org>
Date:   Fri Oct 4 12:33:34 2019 +1000

    tls: 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.
---
 changes/bug31939          | 3 +++
 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 000000000..a36ea495d
--- /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 c176162c3..e92cb9163 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) {