revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Fix Size of Header Metadata Block handling. Now

Browse source 
lzma_metadata.header_metadata_size == LZMA_VLI_VALUE_UNKNOWN
is not allowed at all. To indicate missing Header Metadata
Block, header_metadata_size must be set to zero. This is
what Metadata decoder does after this patch too.

Note that other missing fields in lzma_metadata are still
indicated with LZMA_VLI_VALUE_UNKNOWN. This isn't as
illogical as it sounds at first, because missing Size of
Header Metadata Block means that Header Metadata Block is
not present in the Stream. With other Metadata fields,
a missing field means only that the value is unknown.
This commit is contained in:
Lasse Collin 2008-01-23 13:36:07 +02:00
parent 58b78ab20c
commit 99e12af4e2
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/liblzma/common/info.c
View file

@ -367,7 +367,7 @@ lzma_info_metadata_set(lzma_info *info, lzma_allocator *allocator,
lzma_bool eat_index)
{
// Validate *metadata.
if (!lzma_vli_is_valid(metadata->header_metadata_size)
if (metadata->header_metadata_size > LZMA_VLI_VALUE_MAX
|| !lzma_vli_is_valid(metadata->total_size)
|| !lzma_vli_is_valid(metadata->uncompressed_size)) {
if (eat_index) {
@ -403,15 +403,10 @@ lzma_info_metadata_set(lzma_info *info, lzma_allocator *allocator,
}
// Size of Header Metadata
if (!is_header_metadata) {
// If it is marked unknown in Metadata, it means that
// it's not present.
const lzma_vli size = metadata->header_metadata_size
!= LZMA_VLI_VALUE_UNKNOWN
? metadata->header_metadata_size : 0;
if (!is_header_metadata)
return_if_error(lzma_info_size_set(
info, LZMA_INFO_HEADER_METADATA, size));
}
info, LZMA_INFO_HEADER_METADATA,
metadata->header_metadata_size));
// Total Size
if (metadata->total_size != LZMA_VLI_VALUE_UNKNOWN)

6
src/liblzma/common/metadata_decoder.c
View file

@ -169,6 +169,12 @@ process(lzma_coder *coder, lzma_allocator *allocator)
return LZMA_DATA_ERROR;
--coder->todo_count;
} else {
// Zero indicates that Size of Header Metadata Block
// is not present. That is, after successful Metadata
// decoding, metadata->header_metadata_size is
// never LZMA_VLI_VALUE_UNKNOWN.
coder->metadata->header_metadata_size = 0;
}
coder->sequence = SEQ_TOTAL_SIZE;

11
src/liblzma/common/metadata_encoder.c
View file

@ -87,8 +87,7 @@ process(lzma_coder *coder)
case SEQ_FLAGS:
coder->buffer[coder->buffer_size] = 0;
if (coder->metadata.header_metadata_size
!= LZMA_VLI_VALUE_UNKNOWN)
if (coder->metadata.header_metadata_size != 0)
coder->buffer[coder->buffer_size] |= 0x01;
if (coder->metadata.total_size != LZMA_VLI_VALUE_UNKNOWN)
@ -109,8 +108,7 @@ process(lzma_coder *coder)
break;
case SEQ_HEADER_METADATA_SIZE:
if (coder->metadata.header_metadata_size
!= LZMA_VLI_VALUE_UNKNOWN)
if (coder->metadata.header_metadata_size != 0)
write_vli(coder->metadata.header_metadata_size);
coder->sequence = SEQ_TOTAL_SIZE;
@ -373,13 +371,14 @@ lzma_metadata_size(const lzma_metadata *metadata)
lzma_vli size = 1; // Metadata Flags
// Validate header_metadata_size, total_size, and uncompressed_size.
if (!lzma_vli_is_valid(metadata->header_metadata_size)
if (metadata->header_metadata_size > LZMA_VLI_VALUE_MAX
|| !lzma_vli_is_valid(metadata->total_size)
|| metadata->total_size == 0
|| !lzma_vli_is_valid(metadata->uncompressed_size))
return 0;
// Add the sizes of these three fields.
if (metadata->header_metadata_size != LZMA_VLI_VALUE_UNKNOWN)
if (metadata->header_metadata_size != 0)
size += lzma_vli_size(metadata->header_metadata_size);
if (metadata->total_size != LZMA_VLI_VALUE_UNKNOWN)

4
tests/test_info.c
View file

@ -527,7 +527,7 @@ test6(void)
// still present in Footer.
reset();
metadata = my_metadata;
metadata.header_metadata_size = LZMA_VLI_VALUE_UNKNOWN;
metadata.header_metadata_size = 0;
expect(lzma_info_size_set(info, LZMA_INFO_HEADER_METADATA, 0)
== LZMA_OK);
expect(lzma_info_metadata_set(info, NULL, &metadata, true, false)
@ -539,7 +539,7 @@ test6(void)
// from Footer.
reset();
metadata = my_metadata;
metadata.header_metadata_size = LZMA_VLI_VALUE_UNKNOWN;
metadata.header_metadata_size = 0;
expect(lzma_info_metadata_set(info, NULL, &my_metadata, true, false)
== LZMA_OK);
expect(lzma_info_size_set(info, LZMA_INFO_HEADER_METADATA,