nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
teor 2019-11-25 12:29:43 +10:00
commit f9812ee5f7
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug31939 Normal file
View File

@ -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.

4
src/lib/tls/buffers_tls.c
View File

@ -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) {