[tor-commits] [tor/release-0.3.1] Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input

[nickm@xxxxxxxxxxxxxx]

commit cbaf0c049c8a73a7bbd2e8bf574589f84f99ccd8
Author: teor <teor2345@xxxxxxxxx>
Date:   Fri Jun 16 09:47:32 2017 +1000

    Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input
    
    Fixes #22628.
---
 src/common/compress_zstd.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 11fcf86..a136db4 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -340,8 +340,20 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
       return TOR_COMPRESS_BUFFER_FULL;
 
     return TOR_COMPRESS_DONE;
-  } else {
-    return (retval == 0) ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK;
+  } else /* if (!state->compress) */ {
+    // ZSTD_decompressStream returns 0 if the frame is done, or >0 if it
+    // is incomplete.
+    // We check this above.
+    tor_assert_nonfatal(!ZSTD_isError(retval));
+    // Start a new frame if this frame is done
+    if (retval == 0)
+      return TOR_COMPRESS_DONE;
+    // Don't check out_len, it might have some space left if the next output
+    // chunk is larger than the remaining space
+    else if (*in_len > 0)
+      return  TOR_COMPRESS_BUFFER_FULL;
+    else
+      return TOR_COMPRESS_OK;
   }
 
 #else // HAVE_ZSTD.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits