torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'onionk/inbufoverflow1-043' into ticket33131_044

Browse Source
This commit is contained in:
Nick Mathewson
2020-04-24 08:15:53 -04:00
parent 7f9eaec538 64a934ff05
commit 4dd4dbf046
6 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/connection.c
+6
View File
@@ -3814,6 +3814,12 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read,
at_most = connection_bucket_read_limit(conn, approx_time());
}
/* Do not allow inbuf to grow past BUF_MAX_LEN. */
const ssize_t maximum = BUF_MAX_LEN - buf_datalen(conn->inbuf);
if (at_most > maximum) {
at_most = maximum;
}
slack_in_buf = buf_slack(conn->inbuf);
again:
if ((size_t)at_most > slack_in_buf && slack_in_buf >= 1024) {