Commit a98a2540 authored Oct 11, 2021 by Lasse Collin Committed by Gao Xiang Oct 19, 2021

lib/xz: Move s->lzma.len = 0 initialization to lzma_reset()

It's a more logical place even if the resetting needs to be done
only once per LZMA2 stream (if lzma_reset() called in the middle
of an LZMA2 stream, .len will already be 0).

Link: https://lore.kernel.org/r/20211010213145.17462-4-xiang@kernel.org


Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

parent 4f8d7aba

lib/xz/xz_dec_lzma2.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -791,6 +791,7 @@ static void lzma_reset(struct xz_dec_lzma2 *s)
		s->lzma.rep1 = 0;
		s->lzma.rep2 = 0;
		s->lzma.rep3 = 0;
		s->lzma.len = 0;

		/*
		* All probabilities are initialized to the same value. This hack
		@@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
		}
		}

		s->lzma.len = 0;

		s->lzma2.sequence = SEQ_CONTROL;
		s->lzma2.need_dict_reset = true;