summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-20 10:24:22 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-20 10:24:22 -0400
commiteb632afb17aad58a23f3c8edce865ddf9a338f20 (patch)
tree4e6f70ed2d2b67077761a6586f4101f0563d9353 /src
parent94a1b8b66cb0e6d9a996210e8695a07d8ada95ac (diff)
downloadtor-eb632afb17aad58a23f3c8edce865ddf9a338f20.tar.gz
tor-eb632afb17aad58a23f3c8edce865ddf9a338f20.zip
Correct the fix to bug 22629 to permit trailing non-garbage
This change makes it so that we can decompress concatenated zstd outputs.
Diffstat (limited to 'src')
-rw-r--r--src/common/compress.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/common/compress.c b/src/common/compress.c
index e65894d9d2..c6c3897989 100644
--- a/src/common/compress.c
+++ b/src/common/compress.c
@@ -150,13 +150,7 @@ tor_compress_impl(int compress,
method, compression_level, in_len);
goto err;
} else {
- if (in_len != 0) {
- log_fn(protocol_warn_level, LD_PROTOCOL,
- "Unexpected extra input while decompressing");
- log_debug(LD_GENERAL, "method: %d level: %d at len: %zd",
- method, compression_level, in_len);
- goto err;
- } else {
+ if (in_len == 0) {
goto done;
}
}