diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-04-24 08:15:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-04-24 08:15:53 -0400 |
| commit | 4dd4dbf046693be581dd05cdae1c62e68472d18e (patch) | |
| tree | 1c92656beb6321ae5d6fe91239c8553fea815de4 /src/lib/net | |
| parent | 7f9eaec538b7d01e0d1b130dc4cf2ec634252d46 (diff) | |
| parent | 64a934ff05575d63401fcdfdc6363df32191106c (diff) | |
| download | tor-4dd4dbf046693be581dd05cdae1c62e68472d18e.tar.gz tor-4dd4dbf046693be581dd05cdae1c62e68472d18e.zip | |
Merge remote-tracking branch 'onionk/inbufoverflow1-043' into ticket33131_044
Diffstat (limited to 'src/lib/net')
| -rw-r--r-- | src/lib/net/buffers_net.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c index aa84451074..4dbf491e1a 100644 --- a/src/lib/net/buffers_net.c +++ b/src/lib/net/buffers_net.c @@ -76,7 +76,7 @@ read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, chunk->datalen += read_result; log_debug(LD_NET,"Read %ld bytes. %d on inbuf.", (long)read_result, (int)buf->datalen); - tor_assert(read_result < INT_MAX); + tor_assert(read_result <= BUF_MAX_LEN); return (int)read_result; } } @@ -103,9 +103,9 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, tor_assert(reached_eof); tor_assert(SOCKET_OK(fd)); - if (BUG(buf->datalen >= INT_MAX)) + if (BUG(buf->datalen > BUF_MAX_LEN)) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + if (BUG(buf->datalen > BUF_MAX_LEN - at_most)) return -1; while (at_most > total_read) { @@ -127,7 +127,7 @@ buf_read_from_fd(buf_t *buf, int fd, size_t at_most, check(); if (r < 0) return r; /* Error */ - tor_assert(total_read+r < INT_MAX); + tor_assert(total_read+r <= BUF_MAX_LEN); total_read += r; if ((size_t)r < readlen) { /* eof, block, or no more to read. */ break; @@ -170,7 +170,7 @@ flush_chunk(tor_socket_t fd, buf_t *buf, chunk_t *chunk, size_t sz, } else { *buf_flushlen -= write_result; buf_drain(buf, write_result); - tor_assert(write_result < INT_MAX); + tor_assert(write_result <= BUF_MAX_LEN); return (int)write_result; } } @@ -217,7 +217,7 @@ buf_flush_to_fd(buf_t *buf, int fd, size_t sz, if (r == 0 || (size_t)r < flushlen0) /* can't flush any more now. */ break; } - tor_assert(flushed < INT_MAX); + tor_assert(flushed <= BUF_MAX_LEN); return (int)flushed; } |