diff options
| author | teor <teor@torproject.org> | 2019-11-25 12:37:07 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-25 12:37:07 +1000 |
| commit | 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 (patch) | |
| tree | 17caa24248899bdbf3cd2261d43b3487578a3aef /src/lib/tls | |
| parent | 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 (diff) | |
| parent | 055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd (diff) | |
| download | tor-26071aa3be8f26d7e81384f1d40bb1d5fe94cca0.tar.gz tor-26071aa3be8f26d7e81384f1d40bb1d5fe94cca0.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
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) { |