diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-12 09:23:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-12 09:23:57 -0400 |
| commit | 0729ba2868c42bdd34fb305d858cf2d85030e457 (patch) | |
| tree | 3c62f3a220addd47105bed93ad0a2e8e5077d258 | |
| parent | 2b26815e09760cc84b18791bdbfca27c7b8334f4 (diff) | |
| parent | bac160b4e079398d82a6dda13111fc1f3407d837 (diff) | |
| download | tor-0729ba2868c42bdd34fb305d858cf2d85030e457.tar.gz tor-0729ba2868c42bdd34fb305d858cf2d85030e457.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -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 04ae353cf4..03786cc597 100644 --- 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, |