diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2008-06-01 12:48:17 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2008-06-01 12:48:17 +0300 |
| commit | 369f72fd656f537a9a8e06f13e6d0d4c242be22f (patch) | |
| tree | 7b0d983e6be1ebb4d1361b2efcd125eeacad97a0 /src/liblzma/lzma/lzma_encoder_init.c | |
| parent | Typo fixes from meyering. (diff) | |
| download | xz-369f72fd656f537a9a8e06f13e6d0d4c242be22f.tar.xz | |
Fix a buffer overflow in the LZMA encoder. It was due to my
misunderstanding of the code. There's no tiny fix for this
problem, so I also cleaned up the code in general.
This reduces the speed of the encoder 2-5 % in the fastest
compression mode ("lzma -1"). High compression modes should
have no noticeable performance difference.
This commit breaks things (especially LZMA_SYNC_FLUSH) but I
will fix them once the new format and LZMA2 has been roughly
implemented. Plain LZMA won't support LZMA_SYNC_FLUSH at all
and won't be supported in the new .lzma format. This may
change still but this is what it looks like now.
Support for known uncompressed size (that is, LZMA or LZMA2
without EOPM) is likely to go away. This means there will
be API changes.
Diffstat (limited to 'src/liblzma/lzma/lzma_encoder_init.c')
| -rw-r--r-- | src/liblzma/lzma/lzma_encoder_init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/liblzma/lzma/lzma_encoder_init.c b/src/liblzma/lzma/lzma_encoder_init.c index 0e3fb769..306cea8c 100644 --- a/src/liblzma/lzma/lzma_encoder_init.c +++ b/src/liblzma/lzma/lzma_encoder_init.c @@ -42,7 +42,7 @@ length_encoder_reset(lzma_length_encoder *lencoder, // NLength::CPriceTableEncoder::UpdateTables() for (size_t pos_state = 0; pos_state < num_pos_states; ++pos_state) - lzma_length_encoder_update_table(lencoder, pos_state); + lencoder->counters[pos_state] = 1; return; } @@ -112,7 +112,6 @@ lzma_lzma_encoder_init(lzma_next_coder *next, lzma_allocator *allocator, { const lzma_ret ret = lzma_lz_encoder_reset( &next->coder->lz, allocator, &lzma_lzma_encode, - filters[0].uncompressed_size, options->dictionary_size, OPTS, options->fast_bytes, MATCH_MAX_LEN + 1 + OPTS, options->match_finder, @@ -143,13 +142,13 @@ lzma_lzma_encoder_init(lzma_next_coder *next, lzma_allocator *allocator, next->coder->fast_bytes = options->fast_bytes; // Range coder - rc_reset(next->coder->rc); + rc_reset(&next->coder->rc); // State next->coder->state = 0; next->coder->previous_byte = 0; for (size_t i = 0; i < REP_DISTANCES; ++i) - next->coder->rep_distances[i] = 0; + next->coder->reps[i] = 0; // Bit encoders for (size_t i = 0; i < STATES; ++i) { @@ -190,6 +189,8 @@ lzma_lzma_encoder_init(lzma_next_coder *next, lzma_allocator *allocator, next->coder->now_pos = 0; next->coder->is_initialized = false; + next->coder->is_flushed = false, + next->coder->write_eopm = true; // Initialize the next decoder in the chain, if any. { |