lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-01 09:47:01 +03:00
Code Activity

Merge pull request #3659 from facebook/fixHarness

Browse Source 
Fixed a bug in the educational decoder
This commit is contained in:
Yann Collet
2023-06-05 15:03:14 -04:00
committed by GitHub
parent f60100dd5f 5108c9ac97
commit 8030342eea
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/educational_decoder/zstd_decompress.c
View File

@ -997,7 +997,8 @@ static void decompress_sequences(frame_context_t *const ctx,
const size_t num_sequences); const size_t num_sequences);
static sequence_command_t decode_sequence(sequence_states_t *const state, static sequence_command_t decode_sequence(sequence_states_t *const state,
const u8 *const src, const u8 *const src,
i64 *const offset); i64 *const offset,
int lastSequence);
static void decode_seq_table(FSE_dtable *const table, istream_t *const in, static void decode_seq_table(FSE_dtable *const table, istream_t *const in,
const seq_part_t type, const seq_mode_t mode); const seq_part_t type, const seq_mode_t mode);
@ -1114,7 +1115,7 @@ static void decompress_sequences(frame_context_t *const ctx, istream_t *in,
for (size_t i = 0; i < num_sequences; i++) { for (size_t i = 0; i < num_sequences; i++) {
// Decode sequences one by one // Decode sequences one by one
sequences[i] = decode_sequence(&states, src, &bit_offset); sequences[i] = decode_sequence(&states, src, &bit_offset, i==num_sequences-1);
} }
if (bit_offset != 0) { if (bit_offset != 0) {
@ -1125,7 +1126,8 @@ static void decompress_sequences(frame_context_t *const ctx, istream_t *in,
// Decode a single sequence and update the state // Decode a single sequence and update the state
static sequence_command_t decode_sequence(sequence_states_t *const states, static sequence_command_t decode_sequence(sequence_states_t *const states,
const u8 *const src, const u8 *const src,
i64 *const offset) { i64 *const offset,
int lastSequence) {
// "Each symbol is a code in its own context, which specifies Baseline and // "Each symbol is a code in its own context, which specifies Baseline and
// Number_of_Bits to add. Codes are FSE compressed, and interleaved with raw // Number_of_Bits to add. Codes are FSE compressed, and interleaved with raw
// additional bits in the same bitstream." // additional bits in the same bitstream."
@ -1160,7 +1162,7 @@ static sequence_command_t decode_sequence(sequence_states_t *const states,
// Literals_Length_State is updated, followed by Match_Length_State, and // Literals_Length_State is updated, followed by Match_Length_State, and
// then Offset_State." // then Offset_State."
// If the stream is complete don't read bits to update state // If the stream is complete don't read bits to update state
if (*offset != 0) { if (!lastSequence) {
FSE_update_state(&states->ll_table, &states->ll_state, src, offset); FSE_update_state(&states->ll_table, &states->ll_state, src, offset);
FSE_update_state(&states->ml_table, &states->ml_state, src, offset); FSE_update_state(&states->ml_table, &states->ml_state, src, offset);
FSE_update_state(&states->of_table, &states->of_state, src, offset); FSE_update_state(&states->of_table, &states->of_state, src, offset);