commit 0729ba2868c42bdd34fb305d858cf2d85030e457
parent 2b26815e09760cc84b18791bdbfca27c7b8334f4
Author: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Sep 2017 09:23:57 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
Diffstat:
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
@@ -181,6 +181,7 @@ tor_gzip_compress(char **out, size_t *out_len,
/* In case zlib doesn't work as I think .... */
if (stream->avail_out >= stream->avail_in+16)
break;
+ /* Falls through. */
case Z_BUF_ERROR:
offset = stream->next_out - ((unsigned char*)*out);
old_size = out_size;
@@ -319,6 +320,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
/* In case zlib doesn't work as I think.... */
if (stream->avail_out >= stream->avail_in+16)
break;
+ /* Falls through. */
case Z_BUF_ERROR:
if (stream->avail_out > 0) {
log_fn(protocol_warn_level, LD_PROTOCOL,