diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2013-06-23 17:36:47 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2013-06-26 10:59:19 +0300 |
| commit | cb84e278027a90e9827a6f4d3bb0b4d4744a2fbb (patch) | |
| tree | 6eabf842821ebd5f255e4201162361442fa1df7d /src/xz | |
| parent | Update THANKS. (diff) | |
| download | xz-cb84e278027a90e9827a6f4d3bb0b4d4744a2fbb.tar.xz | |
xz: Validate Uncompressed Size from Block Header in list.c.
This affects only "xz -lvv". Normal decompression with xz
already detected if Block Header and Index had mismatched
Uncompressed Size fields. So this just makes "xz -lvv"
show such files as corrupt instead of showing the
Uncompressed Size from Index.
Diffstat (limited to 'src/xz')
| -rw-r--r-- | src/xz/list.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/xz/list.c b/src/xz/list.c index 98307eb2..0771475c 100644 --- a/src/xz/list.c +++ b/src/xz/list.c @@ -429,7 +429,19 @@ parse_block_header(file_pair *pair, const lzma_index_iter *iter, switch (lzma_block_compressed_size(&block, iter->block.unpadded_size)) { case LZMA_OK: - break; + // Validate also block.uncompressed_size if it is present. + // If it isn't present, there's no need to set it since + // we aren't going to actually decompress the Block; if + // we were decompressing, then we should set it so that + // the Block decoder could validate the Uncompressed Size + // that was stored in the Index. + if (block.uncompressed_size == LZMA_VLI_UNKNOWN + || block.uncompressed_size + == iter->block.uncompressed_size) + break; + + // If the above fails, the file is corrupt so + // LZMA_DATA_ERROR is a good error code. case LZMA_DATA_ERROR: // Free the memory allocated by lzma_block_header_decode(). |