Unverified Commit f9812ee5 authored by teor's avatar teor
Browse files

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

parents 7beaaed2 ff304f3b

changes/bug31939

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

src/lib/tls/buffers_tls.c

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