Commit af76b9dc authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'bug32673_035'

parents 9ea0c0bf 2985a601

changes/bug32673

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (TLS bug handling):

    - When encountering a bug in buf_read_freom_tls(), return a

      "MISC" error code rather than "WANTWRITE".  This change might

      help avoid some CPU-wasting loops if the bug is ever triggered.

      Bug reported by opara.    Fixes bug 32673; bugfix on 0.3.0.4-alpha.

src/lib/tls/buffers_tls.c

+2 −2
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) 
  check_no_tls_errors();



  IF_BUG_ONCE(buf->datalen >= INT_MAX)

    return -1;

    return TOR_TLS_ERROR_MISC;

  IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most)

    return -1;

    return TOR_TLS_ERROR_MISC;



  while (at_most > total_read) {

    size_t readlen = at_most - total_read;