diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-06-24 02:06:52 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-06-24 02:06:52 +0000 |
| commit | 06e09cdd47eaa8f7e90ce2c3df9b4b2042b195f3 (patch) | |
| tree | 770c386ce648c80d67aa7703a5452afa4dfe9003 /src | |
| parent | aafc309414a3e629e32f451d8306015acd0c42b5 (diff) | |
| download | tor-06e09cdd47eaa8f7e90ce2c3df9b4b2042b195f3.tar.gz tor-06e09cdd47eaa8f7e90ce2c3df9b4b2042b195f3.zip | |
Apparently, zlib sometimes reports Z_BUF_ERROR on input exhaustion as well as on running out of output space. This could well fix the assert bug reported by weasel and arma.
svn:r6682
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/torgzip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/torgzip.c b/src/common/torgzip.c index c08ed514d8..aca8386cc7 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -348,6 +348,8 @@ tor_zlib_process(tor_zlib_state_t *state, case Z_STREAM_END: return TOR_ZLIB_DONE; case Z_BUF_ERROR: + if (state->stream.avail_in == 0) + return Z_OK; return TOR_ZLIB_BUF_FULL; case Z_OK: if (state->stream.avail_out == 0) |