[PATCH 2/2] lib/xz: Fix XZ_DYNALLOC to avoid useless memory reallocations.

From: Daniel Walker
Date: Fri Nov 08 2019 - 15:07:52 EST


From: Lasse Collin <lasse.collin@xxxxxxxxxxx>

s->dict.allocated was initialized to 0 but never set after
a successful allocation, thus the code always thought that
the dictionary buffer has to be reallocated.

For the original commit to xz-embedded.git, please refer to:
https://git.tukaani.org/?p=xz-embedded.git;a=commit;h=40d291b

Signed-off-by: Yu Sun <yusun2@xxxxxxxxx>
Cc: xe-linux-external@xxxxxxxxx
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
---
lib/xz/xz_dec_lzma2.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/lib/xz/xz_dec_lzma2.c b/lib/xz/xz_dec_lzma2.c
index 08c3c8049998..156f26fdc4c9 100644
--- a/lib/xz/xz_dec_lzma2.c
+++ b/lib/xz/xz_dec_lzma2.c
@@ -1146,6 +1146,7 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)

if (DEC_IS_DYNALLOC(s->dict.mode)) {
if (s->dict.allocated < s->dict.size) {
+ s->dict.allocated = s->dict.size;
vfree(s->dict.buf);
s->dict.buf = vmalloc(s->dict.size);
if (s->dict.buf == NULL) {
--
2.17.1