cuberite/libdeflate
1
0
Fork 0
mirror of https://github.com/cuberite/libdeflate.git synced 2025-08-03 17:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

deflate_compress: fix checks for sequence store filled

Browse Source 
There were off by 1.
This commit is contained in:
Eric Biggers 2022-01-02 19:44:10 -06:00
parent 4dd63ea272
commit d352945791
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/deflate_compress.c
View File

@ -81,12 +81,12 @@
/* /*
* For the greedy, lazy, and lazy2 compressors: this is the length of the * For the greedy, lazy, and lazy2 compressors: this is the length of the
* sequence store, which is an array where the compressor temporarily stores * sequence store, which is an array where the compressor temporarily stores
* matches that it's going to use in the current block. This value is 1 more * matches that it's going to use in the current block. This value is the
* than the number of matches that can be used in a block. If the sequence * maximum number of matches that can be used in a block. If the sequence store
* store fills up, then the compressor will be forced to end the block early. * fills up, then the compressor will be forced to end the block early. This
* This value should be large enough so that this rarely happens, due to the * value should be large enough so that this rarely happens, due to the block
* block being ended normally before then. Increasing/decreasing this value * being ended normally before then. Increasing/decreasing this value will
* will increase/decrease per-compressor memory usage linearly. * increase/decrease per-compressor memory usage linearly.
*/ */
#define SEQ_STORE_LENGTH 50000 #define SEQ_STORE_LENGTH 50000
@ -184,19 +184,15 @@ check_buildtime_parameters(void)
*/ */
STATIC_ASSERT(SOFT_MAX_BLOCK_LENGTH >= MIN_BLOCK_LENGTH); STATIC_ASSERT(SOFT_MAX_BLOCK_LENGTH >= MIN_BLOCK_LENGTH);
STATIC_ASSERT(FAST_SOFT_MAX_BLOCK_LENGTH >= MIN_BLOCK_LENGTH); STATIC_ASSERT(FAST_SOFT_MAX_BLOCK_LENGTH >= MIN_BLOCK_LENGTH);
STATIC_ASSERT( STATIC_ASSERT(SEQ_STORE_LENGTH * DEFLATE_MIN_MATCH_LEN >=
(SEQ_STORE_LENGTH - 1) * DEFLATE_MIN_MATCH_LEN >=
MIN_BLOCK_LENGTH); MIN_BLOCK_LENGTH);
STATIC_ASSERT( STATIC_ASSERT(FAST_SEQ_STORE_LENGTH * HT_MATCHFINDER_MIN_MATCH_LEN >=
(FAST_SEQ_STORE_LENGTH - 1) * HT_MATCHFINDER_MIN_MATCH_LEN >=
MIN_BLOCK_LENGTH); MIN_BLOCK_LENGTH);
/* Verify that the sequence stores aren't uselessly large. */ /* Verify that the sequence stores aren't uselessly large. */
STATIC_ASSERT( STATIC_ASSERT(SEQ_STORE_LENGTH * DEFLATE_MIN_MATCH_LEN <=
(SEQ_STORE_LENGTH - 1) * DEFLATE_MIN_MATCH_LEN <=
SOFT_MAX_BLOCK_LENGTH + MIN_BLOCK_LENGTH); SOFT_MAX_BLOCK_LENGTH + MIN_BLOCK_LENGTH);
STATIC_ASSERT( STATIC_ASSERT(FAST_SEQ_STORE_LENGTH * HT_MATCHFINDER_MIN_MATCH_LEN <=
(FAST_SEQ_STORE_LENGTH - 1) * HT_MATCHFINDER_MIN_MATCH_LEN <=
FAST_SOFT_MAX_BLOCK_LENGTH + MIN_BLOCK_LENGTH); FAST_SOFT_MAX_BLOCK_LENGTH + MIN_BLOCK_LENGTH);
/* Verify that the maximum codeword lengths are valid. */ /* Verify that the maximum codeword lengths are valid. */
@ -488,11 +484,8 @@ struct libdeflate_compressor {
/* Hash chains matchfinder */ /* Hash chains matchfinder */
struct hc_matchfinder hc_mf; struct hc_matchfinder hc_mf;
/* /* Matches and literals chosen for the current block */
* The matches and literals that the parser has chosen struct deflate_sequence sequences[SEQ_STORE_LENGTH + 1];
* for the current block.
*/
struct deflate_sequence sequences[SEQ_STORE_LENGTH];
} g; /* (g)reedy */ } g; /* (g)reedy */
@ -501,8 +494,9 @@ struct libdeflate_compressor {
/* Hash table matchfinder */ /* Hash table matchfinder */
struct ht_matchfinder ht_mf; struct ht_matchfinder ht_mf;
/* Matches and literals chosen for the current block */
struct deflate_sequence sequences[ struct deflate_sequence sequences[
FAST_SEQ_STORE_LENGTH]; FAST_SEQ_STORE_LENGTH + 1];
} f; /* (f)astest */ } f; /* (f)astest */
@ -2320,7 +2314,7 @@ deflate_compress_fastest(struct libdeflate_compressor * restrict c,
/* Check if it's time to output another block. */ /* Check if it's time to output another block. */
} while (in_next < in_max_block_end && } while (in_next < in_max_block_end &&
seq < &c->p.f.sequences[ARRAY_LEN(c->p.f.sequences)]); seq < &c->p.f.sequences[FAST_SEQ_STORE_LENGTH]);
deflate_flush_block(c, &os, in_block_begin, deflate_flush_block(c, &os, in_block_begin,
in_next - in_block_begin, in_next - in_block_begin,
@ -2402,7 +2396,7 @@ deflate_compress_greedy(struct libdeflate_compressor * restrict c,
/* Check if it's time to output another block. */ /* Check if it's time to output another block. */
} while (in_next < in_max_block_end && } while (in_next < in_max_block_end &&
seq < &c->p.g.sequences[ARRAY_LEN(c->p.g.sequences)] && seq < &c->p.g.sequences[SEQ_STORE_LENGTH] &&
!should_end_block(&c->split_stats, !should_end_block(&c->split_stats,
in_block_begin, in_next, in_end)); in_block_begin, in_next, in_end));
@ -2614,7 +2608,7 @@ deflate_compress_lazy_generic(struct libdeflate_compressor * restrict c,
} }
/* Check if it's time to output another block. */ /* Check if it's time to output another block. */
} while (in_next < in_max_block_end && } while (in_next < in_max_block_end &&
seq < &c->p.g.sequences[ARRAY_LEN(c->p.g.sequences)] && seq < &c->p.g.sequences[SEQ_STORE_LENGTH] &&
!should_end_block(&c->split_stats, !should_end_block(&c->split_stats,
in_block_begin, in_next, in_end)); in_block_begin, in_next, in_end));