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 | 070e82a02d89f06ab83daa1a3186258f5205dde1 (patch) | |
| tree | a13f8bcace006efe0abcbeb5f39796acf7516246 | |
| parent | 9c8b07c5eba7f5809937fb913f851378e30e2667 (diff) | |
| parent | 0729ba2868c42bdd34fb305d858cf2d85030e457 (diff) | |
| download | tor-070e82a02d89f06ab83daa1a3186258f5205dde1.tar.gz tor-070e82a02d89f06ab83daa1a3186258f5205dde1.zip | |
Merge branch 'maint-0.3.0' into release-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, |