diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-20 20:27:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-20 20:27:48 -0400 |
| commit | e51e7bd38b758d3f71a2e31184dde3771f897af8 (patch) | |
| tree | 3dfbb953c92013f8818ab1a066f916ec8dc1b0c6 /src/common | |
| parent | c999e84436a5f7ba1964abd4ae502212f0995bcb (diff) | |
| parent | 782eb02b79363bf8ed609495d516bc59972f4352 (diff) | |
| download | tor-e51e7bd38b758d3f71a2e31184dde3771f897af8.tar.gz tor-e51e7bd38b758d3f71a2e31184dde3771f897af8.zip | |
Merge branch 'bug22502_redux_031' into maint-0.3.1
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compress.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/common/compress.c b/src/common/compress.c index 46aa1d52ba..7926faaa60 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -150,13 +150,7 @@ tor_compress_impl(int compress, method, compression_level, (unsigned long)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: %lu", - method, compression_level, (unsigned long)in_len); - goto err; - } else { + if (in_len == 0) { goto done; } } |