[tor-commits] [tor/release-0.3.1] Correct the fix to bug 22629 to permit trailing non-garbage

[nickm at torproject.org]

commit eb632afb17aad58a23f3c8edce865ddf9a338f20
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 10:24:22 2017 -0400

    Correct the fix to bug 22629 to permit trailing non-garbage
    
    This change makes it so that we can decompress concatenated zstd
    outputs.
---
 src/common/compress.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/common/compress.c b/src/common/compress.c
index e65894d..c6c3897 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;
           }
         }