Merge remote-tracking branch 'ahf-gitlab/bugs/23551'

src/common/buffers.c

@@ -964,7 +964,7 @@ buf_get_line(buf_t *buf, char *data_out, size_t *data_len)
   return 1;
 }
 
-/** Compress on uncompress the <b>data_len</b> bytes in <b>data</b> using the
+/** Compress or uncompress the <b>data_len</b> bytes in <b>data</b> using the
  * compression state <b>state</b>, appending the result to <b>buf</b>.  If
  * <b>done</b> is true, flush the data in the state and finish the
  * compression/uncompression.  Return -1 on failure, 0 on success. */

src/common/compress.c

@@ -562,9 +562,9 @@ tor_compress_process(tor_compress_state_t *state,
                                      finish);
       break;
     case LZMA_METHOD:
-      rv =tor_lzma_compress_process(state->u.lzma_state,
-                                    out, out_len, in, in_len,
-                                    finish);
+      rv = tor_lzma_compress_process(state->u.lzma_state,
+                                     out, out_len, in, in_len,
+                                     finish);
       break;
     case ZSTD_METHOD:
       rv = tor_zstd_compress_process(state->u.zstd_state,

src/test/test_util.c

@@ -6086,8 +6086,7 @@ struct testcase_t util_tests[] = {
   COMPRESS_DOS(zlib, "deflate"),
   COMPRESS_DOS(gzip, "gzip"),
   COMPRESS_DOS(lzma, "x-tor-lzma"),
-  // Disabled for now, since it triggers #23551
-  // COMPRESS_DOS(zstd, "x-zstd"),
+  COMPRESS_DOS(zstd, "x-zstd"),
   UTIL_TEST(gzip_compression_bomb, TT_FORK),
   UTIL_LEGACY(datadir),
   UTIL_LEGACY(memarea),