diff options
| author | teor <teor@torproject.org> | 2019-11-25 12:36:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-25 12:36:59 +1000 |
| commit | 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd (patch) | |
| tree | beefb267f60a2800e2499cc2a7e354408ef81f9c /src/lib/tls | |
| parent | c17ab20ac0d3efb1b9c46fa12685db5b09015481 (diff) | |
| parent | 501b5174d84a121fe5932433e54b2929a5c2876d (diff) | |
| download | tor-055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd.tar.gz tor-055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
Diffstat (limited to 'src/lib/tls')
| -rw-r--r-- | src/lib/tls/buffers_tls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index 3c18cc7e43..bf03b61459 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -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) { |