diff options
| -rw-r--r-- | archival/libarchive/decompress_unlzma.c | 5 | ||||
| -rwxr-xr-x | testsuite/unlzma.tests | 17 | ||||
| -rw-r--r-- | testsuite/unlzma_issue_3.lzma | bin | 0 -> 27 bytes |
3 files changed, 17 insertions, 5 deletions
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c index 0744f23..fb5aac8 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 0e98afe..fcc6e94 100755 --- a/testsuite/unlzma.tests +++ b/testsuite/unlzma.tests @@ -8,14 +8,23 @@ # Damaged encrypted streams testing "unlzma (bad archive 1)" \ - "unlzma <unlzma_issue_1.lzma >/dev/null; echo \$?" \ -"1 + "unlzma <unlzma_issue_1.lzma 2>&1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 " "" "" # Damaged encrypted streams testing "unlzma (bad archive 2)" \ - "unlzma <unlzma_issue_2.lzma >/dev/null; echo \$?" \ -"1 + "unlzma <unlzma_issue_2.lzma 2>&1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 +" "" "" + +# Damaged encrypted streams +testing "unlzma (bad archive 3)" \ + "unlzma <unlzma_issue_3.lzma 2>&1 >/dev/null; echo \$?" \ +"unlzma: corrupted data +1 " "" "" exit $FAILCOUNT diff --git a/testsuite/unlzma_issue_3.lzma b/testsuite/unlzma_issue_3.lzma Binary files differnew file mode 100644 index 0000000..cc60f29 --- /dev/null +++ b/testsuite/unlzma_issue_3.lzma |