nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 22:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of "final" flag in zstd decompression

Browse Source 
We were returning "DONE" on truncated input streams, which was not
what we wanted.
This commit is contained in:
Nick Mathewson 2017-04-27 10:42:05 -04:00
parent 166aa8d741
commit 39cfaba9e2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/compress_zstd.c
View File

@ -316,7 +316,10 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
return TOR_COMPRESS_BUFFER_FULL; return TOR_COMPRESS_BUFFER_FULL;
} }
if (state->compress && finish) { if (!finish) {
// We're not done with the input, so no need to flush.
return TOR_COMPRESS_OK;
} else if (state->compress && finish) {
retval = ZSTD_endStream(state->u.compress_stream, &output); retval = ZSTD_endStream(state->u.compress_stream, &output);
*out = (char *)output.dst + output.pos; *out = (char *)output.dst + output.pos;
@ -333,9 +336,14 @@ tor_zstd_compress_process(tor_zstd_compress_state_t *state,
// epilogue. // epilogue.
if (retval > 0) if (retval > 0)
return TOR_COMPRESS_BUFFER_FULL; return TOR_COMPRESS_BUFFER_FULL;
return TOR_COMPRESS_DONE;
} else {
// ZSTD_flushStream returns 0 if the frame is done, or >0 if it
// is incomplete.
return (retval == 0) ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK;
} }
return finish ? TOR_COMPRESS_DONE : TOR_COMPRESS_OK;
#else // HAVE_ZSTD. #else // HAVE_ZSTD.
(void)state; (void)state;
(void)out; (void)out;