diff options
56 files changed, 3 insertions, 3 deletions
diff --git a/src/liblzma/common/auto_decoder.c b/src/liblzma/common/auto_decoder.c index 05a9fbb4..dd108324 100644 --- a/src/liblzma/common/auto_decoder.c +++ b/src/liblzma/common/auto_decoder.c @@ -52,10 +52,10 @@ auto_decode(lzma_coder *coder, lzma_allocator *allocator, coder->sequence = SEQ_CODE; // Detect the file format. For now this is simple, since if - // it doesn't start with 0xFF (the first magic byte of the + // it doesn't start with 0xFD (the first magic byte of the // new format), it has to be LZMA_Alone, or something that // we don't support at all. - if (in[*in_pos] == 0xFF) { + if (in[*in_pos] == 0xFD) { return_if_error(lzma_stream_decoder_init( &coder->next, allocator, coder->memlimit, coder->flags)); diff --git a/src/liblzma/common/stream_flags_common.c b/src/liblzma/common/stream_flags_common.c index 1f7220ec..ae587717 100644 --- a/src/liblzma/common/stream_flags_common.c +++ b/src/liblzma/common/stream_flags_common.c @@ -20,7 +20,7 @@ #include "stream_flags_common.h" -const uint8_t lzma_header_magic[6] = { 0xFF, 0x4C, 0x5A, 0x4D, 0x41, 0x00 }; +const uint8_t lzma_header_magic[6] = { 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00 }; const uint8_t lzma_footer_magic[2] = { 0x59, 0x5A }; diff --git a/tests/files/bad-0-backward_size.lzma b/tests/files/bad-0-backward_size.lzma Binary files differindex 07c4695a..2b46fa93 100644 --- a/tests/files/bad-0-backward_size.lzma +++ b/tests/files/bad-0-backward_size.lzma diff --git a/tests/files/bad-0-empty-truncated.lzma b/tests/files/bad-0-empty-truncated.lzma Binary files differindex 15b6fe36..f879af84 100644 --- a/tests/files/bad-0-empty-truncated.lzma +++ b/tests/files/bad-0-empty-truncated.lzma diff --git a/tests/files/bad-0-nonempty_index.lzma b/tests/files/bad-0-nonempty_index.lzma Binary files differindex 2a612c61..ed6e81fa 100644 --- a/tests/files/bad-0-nonempty_index.lzma +++ b/tests/files/bad-0-nonempty_index.lzma diff --git a/tests/files/bad-0cat-alone.lzma b/tests/files/bad-0cat-alone.lzma Binary files differindex 650c67f0..a915a3a1 100644 --- a/tests/files/bad-0cat-alone.lzma +++ b/tests/files/bad-0cat-alone.lzma diff --git a/tests/files/bad-0catpad-empty.lzma b/tests/files/bad-0catpad-empty.lzma Binary files differindex 33892a24..97c13302 100644 --- a/tests/files/bad-0catpad-empty.lzma +++ b/tests/files/bad-0catpad-empty.lzma diff --git a/tests/files/bad-0pad-empty.lzma b/tests/files/bad-0pad-empty.lzma Binary files differindex c5b985c0..45e00b74 100644 --- a/tests/files/bad-0pad-empty.lzma +++ b/tests/files/bad-0pad-empty.lzma diff --git a/tests/files/bad-1-block_header-1.lzma b/tests/files/bad-1-block_header-1.lzma Binary files differindex a68119ff..e126a419 100644 --- a/tests/files/bad-1-block_header-1.lzma +++ b/tests/files/bad-1-block_header-1.lzma diff --git a/tests/files/bad-1-block_header-2.lzma b/tests/files/bad-1-block_header-2.lzma Binary files differindex 7a2eb5e4..e3e8166d 100644 --- a/tests/files/bad-1-block_header-2.lzma +++ b/tests/files/bad-1-block_header-2.lzma diff --git a/tests/files/bad-1-block_header-3.lzma b/tests/files/bad-1-block_header-3.lzma Binary files differindex 801a05c1..17955038 100644 --- a/tests/files/bad-1-block_header-3.lzma +++ b/tests/files/bad-1-block_header-3.lzma diff --git a/tests/files/bad-1-block_header-4.lzma b/tests/files/bad-1-block_header-4.lzma Binary files differindex 0d005455..be31ce04 100644 --- a/tests/files/bad-1-block_header-4.lzma +++ b/tests/files/bad-1-block_header-4.lzma diff --git a/tests/files/bad-1-check-crc32.lzma b/tests/files/bad-1-check-crc32.lzma Binary files differindex b82b6591..f8ec7d61 100644 --- a/tests/files/bad-1-check-crc32.lzma +++ b/tests/files/bad-1-check-crc32.lzma diff --git a/tests/files/bad-1-check-crc64.lzma b/tests/files/bad-1-check-crc64.lzma Binary files differindex 57938927..eb406ce6 100644 --- a/tests/files/bad-1-check-crc64.lzma +++ b/tests/files/bad-1-check-crc64.lzma diff --git a/tests/files/bad-1-check-sha256.lzma b/tests/files/bad-1-check-sha256.lzma Binary files differindex e47609cd..e33cee80 100644 --- a/tests/files/bad-1-check-sha256.lzma +++ b/tests/files/bad-1-check-sha256.lzma diff --git a/tests/files/bad-1-lzma2-1.lzma b/tests/files/bad-1-lzma2-1.lzma Binary files differindex 0296e5ff..f7ff6dd3 100644 --- a/tests/files/bad-1-lzma2-1.lzma +++ b/tests/files/bad-1-lzma2-1.lzma diff --git a/tests/files/bad-1-lzma2-2.lzma b/tests/files/bad-1-lzma2-2.lzma Binary files differindex faefa1b4..3b279195 100644 --- a/tests/files/bad-1-lzma2-2.lzma +++ b/tests/files/bad-1-lzma2-2.lzma diff --git a/tests/files/bad-1-lzma2-3.lzma b/tests/files/bad-1-lzma2-3.lzma Binary files differindex fbe3297f..e1a20831 100644 --- a/tests/files/bad-1-lzma2-3.lzma +++ b/tests/files/bad-1-lzma2-3.lzma diff --git a/tests/files/bad-1-lzma2-4.lzma b/tests/files/bad-1-lzma2-4.lzma Binary files differindex ef0dc491..e0eb7aaa 100644 --- a/tests/files/bad-1-lzma2-4.lzma +++ b/tests/files/bad-1-lzma2-4.lzma diff --git a/tests/files/bad-1-lzma2-5.lzma b/tests/files/bad-1-lzma2-5.lzma Binary files differindex 797b7d35..437aeed0 100644 --- a/tests/files/bad-1-lzma2-5.lzma +++ b/tests/files/bad-1-lzma2-5.lzma diff --git a/tests/files/bad-1-lzma2-6.lzma b/tests/files/bad-1-lzma2-6.lzma Binary files differindex 73db5bff..f87cab68 100644 --- a/tests/files/bad-1-lzma2-6.lzma +++ b/tests/files/bad-1-lzma2-6.lzma diff --git a/tests/files/bad-1-lzma2-7.lzma b/tests/files/bad-1-lzma2-7.lzma Binary files differindex 845da22e..1a487ca7 100644 --- a/tests/files/bad-1-lzma2-7.lzma +++ b/tests/files/bad-1-lzma2-7.lzma diff --git a/tests/files/bad-1-stream_flags-1.lzma b/tests/files/bad-1-stream_flags-1.lzma Binary files differindex cd0d6f43..fd77d474 100644 --- a/tests/files/bad-1-stream_flags-1.lzma +++ b/tests/files/bad-1-stream_flags-1.lzma diff --git a/tests/files/bad-1-stream_flags-2.lzma b/tests/files/bad-1-stream_flags-2.lzma Binary files differindex 63dec85b..a4a582ad 100644 --- a/tests/files/bad-1-stream_flags-2.lzma +++ b/tests/files/bad-1-stream_flags-2.lzma diff --git a/tests/files/bad-1-stream_flags-3.lzma b/tests/files/bad-1-stream_flags-3.lzma Binary files differindex 3b306ff7..f10b8d00 100644 --- a/tests/files/bad-1-stream_flags-3.lzma +++ b/tests/files/bad-1-stream_flags-3.lzma diff --git a/tests/files/bad-1-vli-1.lzma b/tests/files/bad-1-vli-1.lzma Binary files differindex 7bcdd568..e2a08b9e 100644 --- a/tests/files/bad-1-vli-1.lzma +++ b/tests/files/bad-1-vli-1.lzma diff --git a/tests/files/bad-1-vli-2.lzma b/tests/files/bad-1-vli-2.lzma Binary files differindex af2b614b..604e8186 100644 --- a/tests/files/bad-1-vli-2.lzma +++ b/tests/files/bad-1-vli-2.lzma diff --git a/tests/files/bad-2-compressed_data_padding.lzma b/tests/files/bad-2-compressed_data_padding.lzma Binary files differindex c9de4748..1d0f58b7 100644 --- a/tests/files/bad-2-compressed_data_padding.lzma +++ b/tests/files/bad-2-compressed_data_padding.lzma diff --git a/tests/files/bad-2-index-1.lzma b/tests/files/bad-2-index-1.lzma Binary files differindex cc6ba6dd..42efda0d 100644 --- a/tests/files/bad-2-index-1.lzma +++ b/tests/files/bad-2-index-1.lzma diff --git a/tests/files/bad-2-index-2.lzma b/tests/files/bad-2-index-2.lzma Binary files differindex 8ce40b63..ee5e89c2 100644 --- a/tests/files/bad-2-index-2.lzma +++ b/tests/files/bad-2-index-2.lzma diff --git a/tests/files/bad-2-index-3.lzma b/tests/files/bad-2-index-3.lzma Binary files differindex de27f55f..f51eaad8 100644 --- a/tests/files/bad-2-index-3.lzma +++ b/tests/files/bad-2-index-3.lzma diff --git a/tests/files/bad-2-index-4.lzma b/tests/files/bad-2-index-4.lzma Binary files differindex 0a273477..1b5b78e4 100644 --- a/tests/files/bad-2-index-4.lzma +++ b/tests/files/bad-2-index-4.lzma diff --git a/tests/files/good-0-empty.lzma b/tests/files/good-0-empty.lzma Binary files differindex 3256fe15..83b95e05 100644 --- a/tests/files/good-0-empty.lzma +++ b/tests/files/good-0-empty.lzma diff --git a/tests/files/good-0cat-empty.lzma b/tests/files/good-0cat-empty.lzma Binary files differindex ef8e106a..e6fc3146 100644 --- a/tests/files/good-0cat-empty.lzma +++ b/tests/files/good-0cat-empty.lzma diff --git a/tests/files/good-0catpad-empty.lzma b/tests/files/good-0catpad-empty.lzma Binary files differindex 7e5a81d4..4f86b7d1 100644 --- a/tests/files/good-0catpad-empty.lzma +++ b/tests/files/good-0catpad-empty.lzma diff --git a/tests/files/good-0pad-empty.lzma b/tests/files/good-0pad-empty.lzma Binary files differindex 3bbc241b..c51e3a69 100644 --- a/tests/files/good-0pad-empty.lzma +++ b/tests/files/good-0pad-empty.lzma diff --git a/tests/files/good-1-3delta-lzma2.lzma b/tests/files/good-1-3delta-lzma2.lzma Binary files differindex 2724ed4b..3edb4805 100644 --- a/tests/files/good-1-3delta-lzma2.lzma +++ b/tests/files/good-1-3delta-lzma2.lzma diff --git a/tests/files/good-1-block_header-1.lzma b/tests/files/good-1-block_header-1.lzma Binary files differindex 0eeaf464..c0cc7200 100644 --- a/tests/files/good-1-block_header-1.lzma +++ b/tests/files/good-1-block_header-1.lzma diff --git a/tests/files/good-1-block_header-2.lzma b/tests/files/good-1-block_header-2.lzma Binary files differindex 7afa25fa..5eb8575c 100644 --- a/tests/files/good-1-block_header-2.lzma +++ b/tests/files/good-1-block_header-2.lzma diff --git a/tests/files/good-1-block_header-3.lzma b/tests/files/good-1-block_header-3.lzma Binary files differindex 85a1f8e8..5e8dc78b 100644 --- a/tests/files/good-1-block_header-3.lzma +++ b/tests/files/good-1-block_header-3.lzma diff --git a/tests/files/good-1-check-crc32.lzma b/tests/files/good-1-check-crc32.lzma Binary files differindex b586af14..949a215d 100644 --- a/tests/files/good-1-check-crc32.lzma +++ b/tests/files/good-1-check-crc32.lzma diff --git a/tests/files/good-1-check-crc64.lzma b/tests/files/good-1-check-crc64.lzma Binary files differindex 9b8cc1f6..6102c945 100644 --- a/tests/files/good-1-check-crc64.lzma +++ b/tests/files/good-1-check-crc64.lzma diff --git a/tests/files/good-1-check-none.lzma b/tests/files/good-1-check-none.lzma Binary files differindex 7b7ccd5f..aab057d7 100644 --- a/tests/files/good-1-check-none.lzma +++ b/tests/files/good-1-check-none.lzma diff --git a/tests/files/good-1-check-sha256.lzma b/tests/files/good-1-check-sha256.lzma Binary files differindex 0919afdb..141a4818 100644 --- a/tests/files/good-1-check-sha256.lzma +++ b/tests/files/good-1-check-sha256.lzma diff --git a/tests/files/good-1-delta-lzma2.tiff.lzma b/tests/files/good-1-delta-lzma2.tiff.lzma Binary files differindex d52b70d4..744fb8d1 100644 --- a/tests/files/good-1-delta-lzma2.tiff.lzma +++ b/tests/files/good-1-delta-lzma2.tiff.lzma diff --git a/tests/files/good-1-lzma2-1.lzma b/tests/files/good-1-lzma2-1.lzma Binary files differindex 386a1c15..96aff26e 100644 --- a/tests/files/good-1-lzma2-1.lzma +++ b/tests/files/good-1-lzma2-1.lzma diff --git a/tests/files/good-1-lzma2-2.lzma b/tests/files/good-1-lzma2-2.lzma Binary files differindex 2397a849..19631d48 100644 --- a/tests/files/good-1-lzma2-2.lzma +++ b/tests/files/good-1-lzma2-2.lzma diff --git a/tests/files/good-1-lzma2-3.lzma b/tests/files/good-1-lzma2-3.lzma Binary files differindex 096f65c1..11c84ee6 100644 --- a/tests/files/good-1-lzma2-3.lzma +++ b/tests/files/good-1-lzma2-3.lzma diff --git a/tests/files/good-1-sparc-lzma2.lzma b/tests/files/good-1-sparc-lzma2.lzma Binary files differindex bfc7ac0b..9111e39b 100644 --- a/tests/files/good-1-sparc-lzma2.lzma +++ b/tests/files/good-1-sparc-lzma2.lzma diff --git a/tests/files/good-1-x86-lzma2.lzma b/tests/files/good-1-x86-lzma2.lzma Binary files differindex 62fb01a2..4fbd0ee4 100644 --- a/tests/files/good-1-x86-lzma2.lzma +++ b/tests/files/good-1-x86-lzma2.lzma diff --git a/tests/files/good-2-lzma2.lzma b/tests/files/good-2-lzma2.lzma Binary files differindex 49165309..dd34b66a 100644 --- a/tests/files/good-2-lzma2.lzma +++ b/tests/files/good-2-lzma2.lzma diff --git a/tests/files/unsupported-block_header.lzma b/tests/files/unsupported-block_header.lzma Binary files differindex 2fa33a5b..ee697e4d 100644 --- a/tests/files/unsupported-block_header.lzma +++ b/tests/files/unsupported-block_header.lzma diff --git a/tests/files/unsupported-check.lzma b/tests/files/unsupported-check.lzma Binary files differindex 6d8a295e..e2fe486b 100644 --- a/tests/files/unsupported-check.lzma +++ b/tests/files/unsupported-check.lzma diff --git a/tests/files/unsupported-filter_flags-1.lzma b/tests/files/unsupported-filter_flags-1.lzma Binary files differindex c70571f9..b4acab24 100644 --- a/tests/files/unsupported-filter_flags-1.lzma +++ b/tests/files/unsupported-filter_flags-1.lzma diff --git a/tests/files/unsupported-filter_flags-2.lzma b/tests/files/unsupported-filter_flags-2.lzma Binary files differindex 1fd68f9e..fa907dc2 100644 --- a/tests/files/unsupported-filter_flags-2.lzma +++ b/tests/files/unsupported-filter_flags-2.lzma diff --git a/tests/files/unsupported-filter_flags-3.lzma b/tests/files/unsupported-filter_flags-3.lzma Binary files differindex dcaf21f8..939ab5fe 100644 --- a/tests/files/unsupported-filter_flags-3.lzma +++ b/tests/files/unsupported-filter_flags-3.lzma |