aboutsummaryrefslogtreecommitdiff
path: root/src/or/buffers.c
diff options
context:
space:
mode:
authorArturo Filastò <hellais@gmail.com>2012-02-22 00:29:16 -0800
committerNick Mathewson <nickm@torproject.org>2012-04-24 11:36:38 -0400
commite0e4b8475708729a57461bb7336931351b874842 (patch)
treea81c055ae8b20b6340627069ae20b77100afe894 /src/or/buffers.c
parent461771ebbce3a86965eb2d696f9d42e9bcb777c9 (diff)
downloadtor-e0e4b8475708729a57461bb7336931351b874842.tar
tor-e0e4b8475708729a57461bb7336931351b874842.tar.gz
Add a check_no_tls_errors() to read_to_buf_tls
Fixes bug #4528 "read_to_buf_tls(): Inconsistency in code". This check was added back in 0.1.0.3-rc, but somehow we forgot to leave it in when we refactored read_to_buf_tls in 0.1.0.5-rc. (patch by Arturo; commit message and changes file by nickm)
Diffstat (limited to 'src/or/buffers.c')
-rw-r--r--src/or/buffers.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index d4fc44ba9..d60e54e87 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -744,6 +744,9 @@ read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf)
{
int r = 0;
size_t total_read = 0;
+
+ check_no_tls_errors();
+
check();
while (at_most > total_read) {