nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input

Browse Source 
Fixes #22628.
This commit is contained in:
teor 2017-06-16 09:47:32 +10:00
parent 617e1da636
commit cbaf0c049c
No known key found for this signature in database
GPG Key ID: 740D9E39025272A2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/compress_zstd.c
View File

@ -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.