unlzma: fix erroneous "while" instead of "if". Closes 4682
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 9 Jan 2017 12:55:11 +0000 (13:55 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Mon, 9 Jan 2017 13:02:55 +0000 (14:02 +0100)
commit3989e5adf454a3ab98412b249c2c9bd2a3175ae0
tree8361ddd5dd5e4d35067ab4166f63aa482fece476
parent8c1d857d2582c689681c7e6d3dc299613b4a7167
unlzma: fix erroneous "while" instead of "if". Closes 4682

These parts of the code essentially check whether
stepping back by rep0 goes negative or not.

LZMA SDK from lzma1604.7z has the following in the corresponding places:

... = dic[dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0)]

Clearly, not loop here.

Technically, "while" here works: if condition is false (because pos
underflowed), it iterates once, adds header.dict_size (a.k.a. dicBufSize),
this makes pos positive but smaller than header.dict_size, and loop exits.

Now we'll just check for negative result of subtraction, which is less code:

function                                             old     new   delta
unpack_lzma_stream                                  2659    2641     -18

(I hope 2 Gbyte+ dictionaries won't be in use soon).

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
archival/libarchive/decompress_unlzma.c