diff options
| author | Denys Vlasenko | 2017-10-27 15:37:03 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-10-27 15:37:03 +0200 |
| commit | 9ac42c500586fa5f10a1f6d22c3f797df11b1f6b (patch) | |
| tree | c4daa76e84cf809b38339f306555015632d1faca | |
| parent | 0402cb32df015d9372578e3db27db47b33d5c7b0 (diff) | |
| download | busybox-9ac42c500586fa5f10a1f6d22c3f797df11b1f6b.zip busybox-9ac42c500586fa5f10a1f6d22c3f797df11b1f6b.tar.gz | |
unlzma: fix SEGV, closes 10436
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/libarchive/decompress_unlzma.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c index a904087..be43424 100644 --- a/archival/libarchive/decompress_unlzma.c +++ b/archival/libarchive/decompress_unlzma.c @@ -450,8 +450,12 @@ unpack_lzma_stream(transformer_state_t *xstate) IF_NOT_FEATURE_LZMA_FAST(string:) do { uint32_t pos = buffer_pos - rep0; - if ((int32_t)pos < 0) + if ((int32_t)pos < 0) { pos += header.dict_size; + /* bug 10436 has an example file where this triggers: */ + if ((int32_t)pos < 0) + goto bad; + } previous_byte = buffer[pos]; IF_NOT_FEATURE_LZMA_FAST(one_byte2:) buffer[buffer_pos++] = previous_byte; |