From 7573e66b9961cdb571c3c7af688fd01912e66455 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 3 Jun 2014 20:38:00 -0400 Subject: Treat Z_BUF_ERROR as TOR_ZLIB_BUF_FULL when finalizing a zlib buffer Otherwise, when we're out of input *and* finalizing, we might report TOR_ZLIB_OK erroneously and not finalize the buffer. (I don't believe this can happen in practice, with our code today: write_to_buf_zlib ensures that we are never trying to write into a completely empty buffer, and zlib says "Z_OK" if you give it even one byte to write into.) Fixes bug 11824; bugfix on 0.1.1.23 (06e09cdd47eaa8f7e90ce2). --- src/common/torgzip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 4328c63c8b..778cbe9169 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -480,7 +480,7 @@ 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) + if (state->stream.avail_in == 0 && !finish) return TOR_ZLIB_OK; return TOR_ZLIB_BUF_FULL; case Z_OK: -- cgit v1.2.3-54-g00ecf