tor

commit f9812ee5f7336bac9caaf57946e46cd19dfaf0be
parent 7beaaed245e99c57a5b35c266da4ff9fa5f2b113
Author: teor <teor@torproject.org>
Date:   Mon, 25 Nov 2019 12:29:43 +1000

Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5

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

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