diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c index 0744f231a..fb5aac8fe 100644 --- a/archival/libarchive/decompress_unlzma.c +++ b/archival/libarchive/decompress_unlzma.c @@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate) uint32_t pos; pos = buffer_pos - rep0; - if ((int32_t)pos < 0) + if ((int32_t)pos < 0) { pos += header.dict_size; + if ((int32_t)pos < 0) + goto bad; + } match_byte = buffer[pos]; do { int bit; diff --git a/testsuite/unlzma.tests b/testsuite/unlzma.tests index 0e98afe09..fcc6e9441 100755 --- a/testsuite/unlzma.tests +++ b/testsuite/unlzma.tests @@ -8,14 +8,23 @@ # Damaged encrypted streams testing "unlzma (bad archive 1)" \ - "unlzma /dev/null; echo \$?" \ -"1 + "unlzma &1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 " "" "" # Damaged encrypted streams testing "unlzma (bad archive 2)" \ - "unlzma /dev/null; echo \$?" \ -"1 + "unlzma &1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 +" "" "" + +# Damaged encrypted streams +testing "unlzma (bad archive 3)" \ + "unlzma &1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 " "" "" exit $FAILCOUNT diff --git a/testsuite/unlzma_issue_3.lzma b/testsuite/unlzma_issue_3.lzma new file mode 100644 index 000000000..cc60f29e4 Binary files /dev/null and b/testsuite/unlzma_issue_3.lzma differ